mirror of
git://git.gnupg.org/gnupg.git
synced 2024-12-23 10:29:58 +01:00
f3ba66781a
* kbx/keybox-util.c (keybox_set_malloc_hooks): Remove. (_keybox_malloc, _keybox_calloc, keybox_realloc) (_keybox_free): Remove. (keybox_file_rename): Remove. Was not used. * sm/gpgsm.c (main): Remove call to keybox_set_malloc_hooks. * kbx/kbxutil.c (main): Ditto. * kbx/keybox-defs.h: Remove all separate includes. Include util.h. remove convenience macros. * common/logging.h (return_if_fail): New. Originally from keybox-defs.h but now using log_debug. (return_null_if_fail): Ditto. (return_val_if_fail): Ditto. (never_reached): Ditto. -- Originally the KBX code was written to allow standalone use. However this required lot of ugliness like separate memory allocators and such. It also precludes the use of some standard functions from common due to their use of the common gnupg malloc functions. Dropping all that makes things easier. Minor disadvantages: the kbx call done for gpg will now use gcry malloc fucntions and not the standard malloc functions. This might be a bit slower but removing them even fixes a possible bug in keybox_tmp_names which is used in gpg and uses gpg's xfree which is actually gcry_free. Signed-off-by: Werner Koch <wk@gnupg.org>
142 lines
5.5 KiB
C
142 lines
5.5 KiB
C
/* logging.h
|
|
* Copyright (C) 1999, 2000, 2001, 2004, 2006,
|
|
* 2010 Free Software Foundation, Inc.
|
|
*
|
|
* This file is part of GnuPG.
|
|
*
|
|
* GnuPG is free software; you can redistribute and/or modify this
|
|
* part of GnuPG under the terms of either
|
|
*
|
|
* - the GNU Lesser General Public License as published by the Free
|
|
* Software Foundation; either version 3 of the License, or (at
|
|
* your option) any later version.
|
|
*
|
|
* or
|
|
*
|
|
* - the GNU General Public License as published by the Free
|
|
* Software Foundation; either version 2 of the License, or (at
|
|
* your option) any later version.
|
|
*
|
|
* or both in parallel, as here.
|
|
*
|
|
* GnuPG is distributed in the hope that it will be useful, but
|
|
* WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* General Public License for more details.
|
|
*
|
|
* You should have received a copies of the GNU General Public License
|
|
* and the GNU Lesser General Public License along with this program;
|
|
* if not, see <https://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#ifndef GNUPG_COMMON_LOGGING_H
|
|
#define GNUPG_COMMON_LOGGING_H
|
|
|
|
#include <stdio.h>
|
|
#include <stdarg.h>
|
|
#include <gpg-error.h>
|
|
#include "mischelp.h"
|
|
#include "w32help.h"
|
|
|
|
int log_get_errorcount (int clear);
|
|
void log_inc_errorcount (void);
|
|
void log_set_file( const char *name );
|
|
void log_set_fd (int fd);
|
|
void log_set_socket_dir_cb (const char *(*fnc)(void));
|
|
void log_set_pid_suffix_cb (int (*cb)(unsigned long *r_value));
|
|
void log_set_prefix (const char *text, unsigned int flags);
|
|
const char *log_get_prefix (unsigned int *flags);
|
|
int log_test_fd (int fd);
|
|
int log_get_fd(void);
|
|
estream_t log_get_stream (void);
|
|
|
|
#ifdef GPGRT_HAVE_MACRO_FUNCTION
|
|
void bug_at (const char *file, int line, const char *func)
|
|
GPGRT_ATTR_NORETURN;
|
|
void _log_assert (const char *expr, const char *file, int line,
|
|
const char *func) GPGRT_ATTR_NORETURN;
|
|
# define BUG() bug_at( __FILE__ , __LINE__, __FUNCTION__)
|
|
# define log_assert(expr) \
|
|
((expr) \
|
|
? (void) 0 \
|
|
: _log_assert (#expr, __FILE__, __LINE__, __FUNCTION__))
|
|
#else /*!GPGRT_HAVE_MACRO_FUNCTION*/
|
|
void bug_at (const char *file, int line);
|
|
void _log_assert (const char *expr, const char *file, int line);
|
|
# define BUG() bug_at( __FILE__ , __LINE__ )
|
|
# define log_assert(expr) \
|
|
((expr) \
|
|
? (void) 0 \
|
|
: _log_assert (#expr, __FILE__, __LINE__))
|
|
#endif /*!GPGRT_HAVE_MACRO_FUNCTION*/
|
|
|
|
/* Flag values for log_set_prefix. */
|
|
#define GPGRT_LOG_WITH_PREFIX 1
|
|
#define GPGRT_LOG_WITH_TIME 2
|
|
#define GPGRT_LOG_WITH_PID 4
|
|
#define GPGRT_LOG_RUN_DETACHED 256
|
|
#define GPGRT_LOG_NO_REGISTRY 512
|
|
|
|
/* Log levels as used by log_log. */
|
|
enum jnlib_log_levels {
|
|
GPGRT_LOG_BEGIN,
|
|
GPGRT_LOG_CONT,
|
|
GPGRT_LOG_INFO,
|
|
GPGRT_LOG_WARN,
|
|
GPGRT_LOG_ERROR,
|
|
GPGRT_LOG_FATAL,
|
|
GPGRT_LOG_BUG,
|
|
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_with_prefix (int level, const char *prefix,
|
|
const char *fmt, va_list arg_ptr);
|
|
void log_string (int level, const char *string);
|
|
void log_bug (const char *fmt, ...) GPGRT_ATTR_NR_PRINTF(1,2);
|
|
void log_fatal (const char *fmt, ...) GPGRT_ATTR_NR_PRINTF(1,2);
|
|
void log_error (const char *fmt, ...) GPGRT_ATTR_PRINTF(1,2);
|
|
void log_info (const char *fmt, ...) GPGRT_ATTR_PRINTF(1,2);
|
|
void log_debug (const char *fmt, ...) GPGRT_ATTR_PRINTF(1,2);
|
|
void log_debug_with_string (const char *string, const char *fmt,
|
|
...) GPGRT_ATTR_PRINTF(2,3);
|
|
void log_printf (const char *fmt, ...) GPGRT_ATTR_PRINTF(1,2);
|
|
void log_flush (void);
|
|
|
|
/* Print a hexdump of BUFFER. With TEXT passes as NULL print just the
|
|
raw dump, with TEXT being an empty string, print a trailing
|
|
linefeed, otherwise print an entire debug line with TEXT followed
|
|
by the hexdump and a final LF. */
|
|
void log_printhex (const char *text, const void *buffer, size_t length);
|
|
|
|
void log_clock (const char *string);
|
|
|
|
|
|
/* Some handy assertion macros which don't abort. */
|
|
|
|
#define return_if_fail(expr) do { \
|
|
if (!(expr)) { \
|
|
log_debug ("%s:%d: assertion '%s' failed\n", \
|
|
__FILE__, __LINE__, #expr ); \
|
|
return; \
|
|
} } while (0)
|
|
#define return_null_if_fail(expr) do { \
|
|
if (!(expr)) { \
|
|
log_debug ("%s:%d: assertion '%s' failed\n", \
|
|
__FILE__, __LINE__, #expr ); \
|
|
return NULL; \
|
|
} } while (0)
|
|
#define return_val_if_fail(expr,val) do { \
|
|
if (!(expr)) { \
|
|
log_debug ("%s:%d: assertion '%s' failed\n", \
|
|
__FILE__, __LINE__, #expr ); \
|
|
return (val); \
|
|
} } while (0)
|
|
#define never_reached() do { \
|
|
log_debug ("%s:%d: oops - should never get here\n", \
|
|
__FILE__, __LINE__ ); \
|
|
} while (0)
|
|
|
|
|
|
#endif /*GNUPG_COMMON_LOGGING_H*/
|