From ef5feb15a7403c6b7ea258927bb04c9111653669 Mon Sep 17 00:00:00 2001 From: Simon Gomizelj Date: Fri, 1 Mar 2013 13:40:02 -0500 Subject: remove :: prefix from all message This will substantially simplify the logic to add colours to messages. Signed-off-by: Simon Gomizelj Signed-off-by: Allan McRae --- src/pacman/util.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) (limited to 'src/pacman/util.c') 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; -- cgit v1.2.3-70-g09d2