diff options
| author | Werner Koch <wk@gnupg.org> | 2015-04-24 15:49:18 +0200 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2015-04-24 16:10:47 +0200 |
| commit | 26d7e0d7accf269c15fb4bc23e5e80580bfb7fe3 (patch) | |
| tree | 3cec75e92b9af25ac5851cd02e9f610ff678a542 /kbx | |
| parent | common: Remove two JNLIB_ macros (jnlib merge). (diff) | |
| download | gnupg2-26d7e0d7accf269c15fb4bc23e5e80580bfb7fe3.tar.xz gnupg2-26d7e0d7accf269c15fb4bc23e5e80580bfb7fe3.zip | |
common: Rename log and gcc attribute macros (jnlib merge).
* common/logging.h: Rename JNLIB_LOG_* to GPGRT_LOG_*.
* common/mischelp.h: Rename JNLIB_GCC_* to GPGRT_GCC_*.
--
JNLIB has no more meaning. Thus we switch to a GPGRT_ prefix in
anticipation that some code may eventually be moved to libgpg-error.
Signed-off-by: Werner Koch <wk@gnupg.org>
Diffstat (limited to 'kbx')
| -rw-r--r-- | kbx/kbxutil.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/kbx/kbxutil.c b/kbx/kbxutil.c index 178b9e8e0..d55a11871 100644 --- a/kbx/kbxutil.c +++ b/kbx/kbxutil.c @@ -137,14 +137,14 @@ my_gcry_logger (void *dummy, int level, const char *fmt, va_list arg_ptr) /* Map the log levels. */ switch (level) { - case GCRY_LOG_CONT: level = JNLIB_LOG_CONT; break; - case GCRY_LOG_INFO: level = JNLIB_LOG_INFO; break; - case GCRY_LOG_WARN: level = JNLIB_LOG_WARN; break; - case GCRY_LOG_ERROR:level = JNLIB_LOG_ERROR; break; - case GCRY_LOG_FATAL:level = JNLIB_LOG_FATAL; break; - case GCRY_LOG_BUG: level = JNLIB_LOG_BUG; break; - case GCRY_LOG_DEBUG:level = JNLIB_LOG_DEBUG; break; - default: level = JNLIB_LOG_ERROR; break; + case GCRY_LOG_CONT: level = GPGRT_LOG_CONT; break; + case GCRY_LOG_INFO: level = GPGRT_LOG_INFO; break; + case GCRY_LOG_WARN: level = GPGRT_LOG_WARN; break; + case GCRY_LOG_ERROR:level = GPGRT_LOG_ERROR; break; + case GCRY_LOG_FATAL:level = GPGRT_LOG_FATAL; break; + case GCRY_LOG_BUG: level = GPGRT_LOG_BUG; break; + case GCRY_LOG_DEBUG:level = GPGRT_LOG_DEBUG; break; + default: level = GPGRT_LOG_ERROR; break; } log_logv (level, fmt, arg_ptr); } |