security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-02-01 16:33:02 +01:00
Code Activity

common: Extend log_string to indent lines.

Browse Source 
* common/logging.c (do_logv): Add indentation when called via
log_string.

Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
Werner Koch 2016-04-29 21:45:15 +02:00
parent dcad99c986
commit 35f4b6aafd
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
common/logging.c
View File

@ -715,7 +715,21 @@ do_logv (int level, int ignore_arg_ptr, const char *fmt, va_list arg_ptr)
if (fmt) if (fmt)
{ {
if (ignore_arg_ptr) if (ignore_arg_ptr)
es_fputs_unlocked (fmt, logstream); { /* This is used by log_string and comes with the extra
* feature that after a LF the next line is indent at the
* length of the prefix. Note that we do not yet include
* the length of the timestamp and pid in the indent
* computation. */
const char *p, *pend;
for (p = fmt; (pend = strchr (p, '\n')); p = pend+1)
es_fprintf_unlocked (logstream, "%*s%.*s",
(int)((p != fmt
&& (with_prefix || force_prefixes))
?strlen (prefix_buffer)+2:0), "",
(int)(pend - p)+1, p);
es_fputs_unlocked (p, logstream);
}
else else
es_vfprintf_unlocked (logstream, fmt, arg_ptr); es_vfprintf_unlocked (logstream, fmt, arg_ptr);
if (*fmt && fmt[strlen(fmt)-1] != '\n') if (*fmt && fmt[strlen(fmt)-1] != '\n')
@ -769,12 +783,13 @@ do_log_ignore_arg (int level, const char *str, ...)
} }
/* Log STRING at LEVEL but indent from the second line on by the
* length of the prefix. */
void void
log_string (int level, const char *string) log_string (int level, const char *string)
{ {
/* We need a dummy arg_ptr, but there is no portable way to create /* We need a dummy arg_ptr, but there is no portable way to create
one. So we call the do_logv function through a variadic wrapper. * one. So we call the do_logv function through a variadic wrapper. */
MB: Why not just use "%s"? */
do_log_ignore_arg (level, string); do_log_ignore_arg (level, string);
} }