diff options
| author | Werner Koch <[email protected]> | 2024-05-16 07:34:00 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2024-05-16 07:34:46 +0000 |
| commit | 7f661aa129fd5d57ae5247b01143960c5a3c99a7 (patch) | |
| tree | c2919185f006df678e0a31749e943be8f8bef870 /kbx | |
| parent | po: Enable Dutch translation (diff) | |
| download | gnupg-7f661aa129fd5d57ae5247b01143960c5a3c99a7.tar.gz gnupg-7f661aa129fd5d57ae5247b01143960c5a3c99a7.zip | |
kbx: Use standard function to setup gcrypt logging in kbxutil.
* kbx/kbxutil.c (main): Use setup_libgcrypt_logging.
(my_gcry_logger): Remove.
Diffstat (limited to 'kbx')
| -rw-r--r-- | kbx/kbxutil.c | 25 |
1 files changed, 1 insertions, 24 deletions
diff --git a/kbx/kbxutil.c b/kbx/kbxutil.c index f5bc8bd77..935dbc735 100644 --- a/kbx/kbxutil.c +++ b/kbx/kbxutil.c @@ -132,28 +132,6 @@ my_strusage( int level ) } -/* Used by gcry for logging */ -static void -my_gcry_logger (void *dummy, int level, const char *fmt, va_list arg_ptr) -{ - (void)dummy; - - /* Map the log levels. */ - switch (level) - { - case GCRY_LOG_CONT: level = GPGRT_LOGLVL_CONT; break; - case GCRY_LOG_INFO: level = GPGRT_LOGLVL_INFO; break; - case GCRY_LOG_WARN: level = GPGRT_LOGLVL_WARN; break; - case GCRY_LOG_ERROR:level = GPGRT_LOGLVL_ERROR; break; - case GCRY_LOG_FATAL:level = GPGRT_LOGLVL_FATAL; break; - case GCRY_LOG_BUG: level = GPGRT_LOGLVL_BUG; break; - case GCRY_LOG_DEBUG:level = GPGRT_LOGLVL_DEBUG; break; - default: level = GPGRT_LOGLVL_ERROR; break; - } - log_logv (level, fmt, arg_ptr); -} - - /* static void */ /* wrong_args( const char *text ) */ @@ -480,8 +458,7 @@ main (int argc, char **argv) /* Make sure that our subsystems are ready. */ i18n_init (); init_common_subsystems (&argc, &argv); - - gcry_set_log_handler (my_gcry_logger, NULL); + setup_libgcrypt_logging (); /*create_dotlock(NULL); register locking cleanup */ |