mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-03 22:56:33 +02:00
Use the gpgrt log functions if possible.
* common/logging.c: Do not build any code if we can use the gpgrt_log functions. (log_logv_with_prefix): Rename to log_logv_prefix and change order of args so that this function matches its printf like counterpart gpgrt_logv_prefix. Change all callers. (log_debug_with_string): Rename to log_debug_string. Change all callers. (log_printhex): Move first arg to end so that this function matches its printf like counterpart gpgrt_log_printhex. Change all callers. * common/logging.h: Divert to gpgrt/libgpg-error if we can use the gpgrt_log functions. (bug_at): Add inline versions if we can use the gpgrt_log functions. * configure.ac (GPGRT_ENABLE_LOG_MACROS): Add to AH_BOTTOM. (mycflags): Add -Wno-format-zero-length. -- This patch enables the use of the log function from libgpgrt (aka libgpg-error). Instead of checking a version number, we enable them depending on macros set by recent gpg-error versions. Eventually the whole divert stuff can be removed. The -Wno-format-zero-length is required because log_printhex can be called with an empty format string. Note that this is fully specified standard C behaviour. Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
parent
fe96ca8d86
commit
b56dfdfc18
25 changed files with 107 additions and 70 deletions
|
@ -318,7 +318,7 @@ dump_tupledesc (tupledesc_t tuples)
|
|||
if (n < 100 && all_printable (value, n))
|
||||
log_printf ("%.*s\n", (int)n, (const char*)value);
|
||||
else
|
||||
log_printhex ("", value, n);
|
||||
log_printhex (value, n, "");
|
||||
break;
|
||||
|
||||
case KEYBLOB_TAG_CONT_NSEC:
|
||||
|
@ -327,11 +327,11 @@ dump_tupledesc (tupledesc_t tuples)
|
|||
if (!convert_uint (value, n, &uint))
|
||||
log_printf ("%llu\n", uint);
|
||||
else
|
||||
log_printhex ("", value, n);
|
||||
log_printhex (value, n, "");
|
||||
break;
|
||||
|
||||
default:
|
||||
log_printhex ("", value, n);
|
||||
log_printhex (value, n, "");
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue