diff options
| author | DongHun Kwak <dh0128.kwak@samsung.com> | 2021-02-09 15:59:58 +0900 |
|---|---|---|
| committer | DongHun Kwak <dh0128.kwak@samsung.com> | 2021-02-09 15:59:58 +0900 |
| commit | ac9c4f87d9e015cdbaa757ba267c36d79d23db58 (patch) | |
| tree | fb2b78a271fbb78740f1ab526f5b5acd0b6d48d4 /kbx/kbxutil.c | |
| parent | ed6a57244711b05833b351b7f7c88015e7ef16a7 (diff) | |
| download | gpg2-ac9c4f87d9e015cdbaa757ba267c36d79d23db58.tar.gz gpg2-ac9c4f87d9e015cdbaa757ba267c36d79d23db58.tar.bz2 gpg2-ac9c4f87d9e015cdbaa757ba267c36d79d23db58.zip | |
Imported Upstream version 2.1.4upstream/2.1.4
Diffstat (limited to 'kbx/kbxutil.c')
| -rw-r--r-- | kbx/kbxutil.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/kbx/kbxutil.c b/kbx/kbxutil.c index 368c02d..d55a118 100644 --- a/kbx/kbxutil.c +++ b/kbx/kbxutil.c @@ -28,7 +28,6 @@ #include <limits.h> #include <assert.h> -#define JNLIB_NEED_LOG_LOGV #include <gpg-error.h> #include "../common/logging.h" #include "../common/argparse.h" @@ -138,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); } |