summaryrefslogtreecommitdiffstats
path: root/src/pacman/util.c
diff options
context:
space:
mode:
authorSimon Gomizelj <simongmzlj@gmail.com>2013-03-01 19:40:02 +0100
committerAllan McRae <allan@archlinux.org>2013-03-07 06:55:03 +0100
commitef5feb15a7403c6b7ea258927bb04c9111653669 (patch)
treef8392a42f0d27d18f6ff2c53b6cd406ec2b4359c /src/pacman/util.c
parent098cfe516d0a406ace95b12eeb5a2fecaff27a8b (diff)
downloadpacman-ef5feb15a7403c6b7ea258927bb04c9111653669.tar.gz
pacman-ef5feb15a7403c6b7ea258927bb04c9111653669.tar.xz
remove :: prefix from all message
This will substantially simplify the logic to add colours to messages. Signed-off-by: Simon Gomizelj <simongmzlj@gmail.com> Signed-off-by: Allan McRae <allan@archlinux.org>
Diffstat (limited to 'src/pacman/util.c')
-rw-r--r--src/pacman/util.c17
1 files changed, 15 insertions, 2 deletions
diff --git a/src/pacman/util.c b/src/pacman/util.c
index 3270c746..182450bf 100644
--- a/src/pacman/util.c
+++ b/src/pacman/util.c
@@ -1219,8 +1219,7 @@ static void display_repo_list(const char *dbname, alpm_list_t *list,
{
const char *prefix = " ";
- printf(":: ");
- printf(_("Repository %s\n"), dbname);
+ colon_printf(_("Repository %s\n"), dbname);
list_display(prefix, list, cols);
}
@@ -1461,6 +1460,7 @@ static int question(short preset, char *fmt, va_list args)
fflush(stdout);
fflush(stderr);
+ fprintf(stream, ":: ");
vfprintf(stream, fmt, args);
if(preset) {
@@ -1522,6 +1522,19 @@ int noyes(char *fmt, ...)
return ret;
}
+int colon_printf(const char *fmt, ...)
+{
+ int ret;
+ va_list args;
+
+ fputs(":: ", stdout);
+ va_start(args, fmt);
+ ret = vprintf(fmt, args);
+ va_end(args);
+
+ return ret;
+}
+
int pm_printf(alpm_loglevel_t level, const char *format, ...)
{
int ret;