Imported Upstream version 2.1.4

[platform/upstream/gpg2.git] / common / logging.h

diff --git a/common/logging.h b/common/logging.h
index 7487b35..0bd1a6c 100644 (file)
--- a/common/logging.h
+++ b/common/logging.h
@@ -2,9 +2,9 @@
  * Copyright (C) 1999, 2000, 2001, 2004, 2006,
  *               2010 Free Software Foundation, Inc.
  *
- * This file is part of JNLIB, which is a subsystem of GnuPG.
+ * This file is part of GnuPG.
  *
- * JNLIB is free software; you can redistribute it and/or modify it
+ * GnuPG 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
@@ -19,7 +19,7 @@
  *
  * or both in parallel, as here.
  *
- * JNLIB is distributed in the hope that it will be useful, but
+ * 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.
@@ -29,20 +29,14 @@
  * if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LIBJNLIB_LOGGING_H
-#define LIBJNLIB_LOGGING_H
+#ifndef GNUPG_COMMON_LOGGING_H
+#define GNUPG_COMMON_LOGGING_H
 
 #include <stdio.h>
+#include <stdarg.h>
 #include "mischelp.h"
 #include "w32help.h"
 
-/* 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
-
 int  log_get_errorcount (int clear);
 void log_inc_errorcount (void);
 void log_set_file( const char *name );
@@ -54,40 +48,43 @@ 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;
+#ifdef GPGRT_GCC_M_FUNCTION
+  void bug_at( const char *file, int line, const char *func ) GPGRT_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
 
-/* To avoid mandatory inclusion of stdarg and other stuff, do it only
-   if explicitly requested to do so. */
-#ifdef JNLIB_NEED_LOG_LOGV
-#include <stdarg.h>
+/* 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 {
-    JNLIB_LOG_BEGIN,
-    JNLIB_LOG_CONT,
-    JNLIB_LOG_INFO,
-    JNLIB_LOG_WARN,
-    JNLIB_LOG_ERROR,
-    JNLIB_LOG_FATAL,
-    JNLIB_LOG_BUG,
-    JNLIB_LOG_DEBUG
+    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, ...) JNLIB_GCC_A_PRINTF(2,3);
+void log_log (int level, const char *fmt, ...) GPGRT_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);
-#endif /*JNLIB_NEED_LOG_LOGV*/
 
 
-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_bug( const char *fmt, ... )   GPGRT_GCC_A_NR_PRINTF(1,2);
+void log_fatal( const char *fmt, ... ) GPGRT_GCC_A_NR_PRINTF(1,2);
+void log_error( const char *fmt, ... ) GPGRT_GCC_A_PRINTF(1,2);
+void log_info( const char *fmt, ... )  GPGRT_GCC_A_PRINTF(1,2);
+void log_debug( const char *fmt, ... ) GPGRT_GCC_A_PRINTF(1,2);
+void log_printf( const char *fmt, ... ) GPGRT_GCC_A_PRINTF(1,2);
 void log_flush (void);
 
 /* Print a hexdump of BUFFER.  With TEXT passes as NULL print just the
@@ -99,4 +96,4 @@ void log_printhex (const char *text, const void *buffer, size_t length);
 void log_clock (const char *string);
 
 
-#endif /*LIBJNLIB_LOGGING_H*/
+#endif /*GNUPG_COMMON_LOGGING_H*/