mirror of
git://git.gnupg.org/gnupg.git
synced 2024-06-04 22:57:47 +02:00
17bcd08708
* common/libjnlib-config.h: Remove. * common/common-defs.h (getenv) [HAVE_GETENV]: New. From removed header. (getpid) [HAVE_W32CE_SYSTEM]: New. From removed header. * common/argparse.c: Include util.h and common-defs.h. Replace jnlib_ macro names for non-GNUPG builds by x* names. * common/dotlock.c: Ditto. * common/logging.c: Include util.h and common-defs.h. Replace jnlib_ symbol names by x* names. * common/strlist.c: Ditto. * common/utf8conv.c: Ditto. * common/w32-reg.c: Ditto. * common/mischelp.c: Ditto. Also remove _jnlib_free. * common/stringhelp.c: Ditto. (JNLIB_LOG_WITH_PREFIX): Do not depend on this macro. * common/logging.h (JNLIB_LOG_WITH_PREFIX): Do not depend on this macro. -- This is part 1 of the patches to merge the jnlib files into common/. It does not make much sense to keep jnlib/ files separate. They are not often use elsewhere and maintaining the complex marcos stuff is too troublesome for the future. Signed-off-by: Werner Koch <wk@gnupg.org>
100 lines
3.2 KiB
C
100 lines
3.2 KiB
C
/* logging.h
|
|
* Copyright (C) 1999, 2000, 2001, 2004, 2006,
|
|
* 2010 Free Software Foundation, Inc.
|
|
*
|
|
* This file is part of JNLIB, which is a subsystem of GnuPG.
|
|
*
|
|
* JNLIB is free software; you can redistribute it and/or modify it
|
|
* 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.
|
|
*
|
|
* JNLIB 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 <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#ifndef LIBJNLIB_LOGGING_H
|
|
#define LIBJNLIB_LOGGING_H
|
|
|
|
#include <stdio.h>
|
|
#include <stdarg.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_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 JNLIB_GCC_M_FUNCTION
|
|
void bug_at( const char *file, int line, const char *func ) JNLIB_GCC_A_NR;
|
|
# define BUG() bug_at( __FILE__ , __LINE__, __FUNCTION__ )
|
|
#else
|
|
void bug_at( const char *file, int line );
|
|
# define BUG() bug_at( __FILE__ , __LINE__ )
|
|
#endif
|
|
|
|
/* Flag values for log_set_prefix. */
|
|
#define JNLIB_LOG_WITH_PREFIX 1
|
|
#define JNLIB_LOG_WITH_TIME 2
|
|
#define JNLIB_LOG_WITH_PID 4
|
|
#define JNLIB_LOG_RUN_DETACHED 256
|
|
#define JNLIB_LOG_NO_REGISTRY 512
|
|
|
|
/* Log levels as used by log_log. */
|
|
enum jnlib_log_levels {
|
|
JNLIB_LOG_BEGIN,
|
|
JNLIB_LOG_CONT,
|
|
JNLIB_LOG_INFO,
|
|
JNLIB_LOG_WARN,
|
|
JNLIB_LOG_ERROR,
|
|
JNLIB_LOG_FATAL,
|
|
JNLIB_LOG_BUG,
|
|
JNLIB_LOG_DEBUG
|
|
};
|
|
void log_log (int level, const char *fmt, ...) JNLIB_GCC_A_PRINTF(2,3);
|
|
void log_logv (int level, const char *fmt, va_list arg_ptr);
|
|
void log_string (int level, const char *string);
|
|
|
|
|
|
void log_bug( const char *fmt, ... ) JNLIB_GCC_A_NR_PRINTF(1,2);
|
|
void log_fatal( const char *fmt, ... ) JNLIB_GCC_A_NR_PRINTF(1,2);
|
|
void log_error( const char *fmt, ... ) JNLIB_GCC_A_PRINTF(1,2);
|
|
void log_info( const char *fmt, ... ) JNLIB_GCC_A_PRINTF(1,2);
|
|
void log_debug( const char *fmt, ... ) JNLIB_GCC_A_PRINTF(1,2);
|
|
void log_printf( const char *fmt, ... ) JNLIB_GCC_A_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);
|
|
|
|
|
|
#endif /*LIBJNLIB_LOGGING_H*/
|