security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-02 22:46:30 +02:00
Code Activity

Adjust for changed macro names in libgpg-error master.

Browse source 
* common/logging.h (GPGRT_LOGLVL_): New replacement macros for older
libgpg-error versions.

--

Updates-commit: b56dfdfc18
Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
Werner Koch 2017-12-11 10:37:30 +01:00
parent 6d14be22a1
commit 34defc9bce
No known key found for this signature in database
GPG key ID: E3FDFF218E45B72B
11 changed files with 39 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

2
common/asshelp.c
View file

@ -93,7 +93,7 @@ my_libassuan_log_handler (assuan_context_t ctx, void *hook,
return 0; /* Temporary disabled. */
if (msg)
log_string (GPGRT_LOG_DEBUG, msg);
log_string (GPGRT_LOGLVL_DEBUG, msg);
return 1;
}

14
common/logging.h
View file

@ -48,7 +48,8 @@ static inline void bug_at (const char *file, int line, const char *func)
static inline void
bug_at (const char *file, int line, const char *func)
{
gpgrt_log (GPGRT_LOG_BUG, "there is a bug at %s:%d:%s\n", file, line, func);
gpgrt_log (GPGRT_LOGLVL_BUG, "there is a bug at %s:%d:%s\n",
file, line, func);
abort ();
}
# else
@ -58,7 +59,7 @@ static inline void bug_at (const char *file, int line)
static inline void
bug_at (const char *file, int line)
{
gpgrt_log (GPGRT_LOG_BUG, "there is a bug at %s:%d\n", file, line);
gpgrt_log (GPGRT_LOGLVL_BUG, "there is a bug at %s:%d\n", file, line);
abort ();
}
# endif /*!GPGRT_HAVE_MACRO_FUNCTION*/
@ -116,6 +117,15 @@ enum jnlib_log_levels {
GPGRT_LOG_BUG,
GPGRT_LOG_DEBUG
};
#define GPGRT_LOGLVL_BEGIN GPGRT_LOG_BEGIN
#define GPGRT_LOGLVL_CONT GPGRT_LOG_CONT
#define GPGRT_LOGLVL_INFO GPGRT_LOG_INFO
#define GPGRT_LOGLVL_WARN GPGRT_LOG_WARN
#define GPGRT_LOGLVL_ERROR GPGRT_LOG_ERROR
#define GPGRT_LOGLVL_FATAL GPGRT_LOG_FATAL
#define GPGRT_LOGLVL_BUG GPGRT_LOG_BUG
#define GPGRT_LOGLVL_DEBUG GPGRT_LOG_DEBUG
void log_log (int level, const char *fmt, ...) GPGRT_ATTR_PRINTF(2,3);
void log_logv (int level, const char *fmt, va_list arg_ptr);
void log_logv_prefix (int level, const char *prefix,

16
common/miscellaneous.c
View file

@ -45,14 +45,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 = 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;
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);
}