Require libgpg-error 1.29 and remove internal logging functions.

* configure.ac (NEED_GPG_ERROR_VERSION): Set to 1.29
* common/util.h: Remove replacement error codes.
* common/logging.h: Remove fallback to internal logging functions.
* common/logging.c: Remove.
* common/Makefile.am (common_sources): Remove logging.c

Signed-off-by: Werner Koch <wk@gnupg.org>

1 files changed, 4 insertions, 90 deletions

diff --git a/common/logging.h b/common/logging.h
index a20b8f895..a5800cb4c 100644
--- a/common/logging.h
+++ b/common/logging.h
@@ -38,10 +38,9 @@
 #include "mischelp.h"
 #include "w32help.h"
 
-#if defined(GPGRT_ENABLE_LOG_MACROS) && defined(log_debug_string)
-  /* We use the libgpg-error provided log functions.  but we need one
-   * more function:  */
-# ifdef GPGRT_HAVE_MACRO_FUNCTION
+/* We use the libgpg-error provided log functions.  but we need one
+ * more function:  */
+#ifdef GPGRT_HAVE_MACRO_FUNCTION
 #  define BUG() bug_at ( __FILE__, __LINE__, __FUNCTION__)
 static inline void bug_at (const char *file, int line, const char *func)
                            GPGRT_ATTR_NORETURN;
@@ -52,7 +51,7 @@ bug_at (const char *file, int line, const char *func)
              file, line, func);
   abort ();
 }
-# else
+#else
 #  define BUG() bug_at ( __FILE__, __LINE__)
 static inline void bug_at (const char *file, int line)
                            GPGRT_ATTR_NORETURN;
@@ -62,94 +61,9 @@ bug_at (const char *file, int line)
   gpgrt_log (GPGRT_LOGLVL_BUG, "there is a bug at %s:%d\n", file, line);
   abort ();
 }
-# endif /*!GPGRT_HAVE_MACRO_FUNCTION*/
-
-
-#else /* Use gnupg internal logging functions.  */
-
-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
-};
-#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,
-                      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_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 void *buffer, size_t length, const char *text);
-
-void log_clock (const char *fmt, ...) GPGRT_ATTR_PRINTF(1,2);
 
-#endif /* Use gnupg internal logging functions.  */
 
 /* Some handy assertion macros which don't abort.  */