diff options
| author | Daniel Kahn Gillmor <[email protected]> | 2016-08-12 05:37:58 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2016-08-12 10:18:17 +0000 |
| commit | 3a75ff65fba24ea2d024bd8fef633ab7d8f7d520 (patch) | |
| tree | 708b8b44553d764d1ae4441a1fc0925e01bc6d92 | |
| parent | Call log_set_prefix() with human-readable labels. (diff) | |
| download | gnupg-3a75ff65fba24ea2d024bd8fef633ab7d8f7d520.tar.gz gnupg-3a75ff65fba24ea2d024bd8fef633ab7d8f7d520.zip | |
Avoid leading ": " in the log output when there are no prefixes.
* common/logging.c (do_logv): When no prefixes have been requested,
omit the ": " separator, since there is nothing on the left-hand
side of it.
Signed-off-by: Daniel Kahn Gillmor <[email protected]>
Diffstat (limited to '')
| -rw-r--r-- | common/logging.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/common/logging.c b/common/logging.c index b6bafc79d..c70ba355d 100644 --- a/common/logging.c +++ b/common/logging.c @@ -687,14 +687,15 @@ do_logv (int level, int ignore_arg_ptr, const char *fmt, va_list arg_ptr) else es_fprintf_unlocked (logstream, "[%u]", (unsigned int)getpid ()); } - if (!with_time || force_prefixes) + if ((!with_time && (with_prefix || with_pid)) || force_prefixes) es_putc_unlocked (':', logstream); /* A leading backspace suppresses the extra space so that we can correctly output, programname, filename and linenumber. */ if (fmt && *fmt == '\b') fmt++; else - es_putc_unlocked (' ', logstream); + if (with_time || with_prefix || with_pid || force_prefixes) + es_putc_unlocked (' ', logstream); } switch (level) |