/*
- * Copyright (c) 1995-2003, Index Data.
+ * Copyright (c) 1995-2004, Index Data.
*
* Permission to use, copy, modify, distribute, and sell this software and
* its documentation, in whole or in part, for any purpose, is hereby granted,
* LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
* OF THIS SOFTWARE.
*
- * $Id: log.h,v 1.8 2003-01-06 08:20:27 adam Exp $
+ * $Id: log.h,v 1.24 2004-11-26 11:06:29 heikki Exp $
+ */
+
+/**
+ * \file log.h
+ * \brief The old, deprecated header for log.c
*/
#ifndef LOG_H
#define LOG_H
+#include <yaz/ylog.h>
+
+#ifndef YAZ_USE_OLD_LOG
+#warning "use of log.h is deprecated, use ylog.h instead"
+/* if this warning gets on your nerves, run configure like this:
+ * CFLAGS="-Wall -g -D YAZ_USE_OLD_LOG" ./configure
+ */
+#endif
+
#include <stdio.h>
#include <yaz/yconfig.h>
#include <yaz/xmalloc.h>
YAZ_BEGIN_CDECL
-#define LOG_FATAL 0x0001
-#define LOG_DEBUG 0x0002
-#define LOG_WARN 0x0004
-#define LOG_LOG 0x0008
-#define LOG_ERRNO 0x0010 /* append strerror to message */
-#define LOG_FILE 0x0020
-#define LOG_APP 0x0040 /* For application level events such as new-connection */
-#define LOG_MALLOC 0x0080 /* debugging mallocs */
+/* The old LOG_ bit names are here for compatibility only. They may
+ * conflict with bits defined in syslog.h, or other places. 'LOG'
+ * really is not such a good name. YLOG must be more unique
+ */
+#define LOG_FATAL YLOG_FATAL
+#define LOG_DEBUG YLOG_DEBUG
+#define LOG_WARN YLOG_WARN
+#define LOG_LOG YLOG_LOG /* Deprecated, use the modern dynamic log levels*/
+#define LOG_ERRNO YLOG_ERRNO
+#define LOG_FILE 0x00000020 /* Deprecated - not in ylog.h at all*/
+#define LOG_APP 0x00000040 /* Deprecated - not in ylog.h at all*/
+#define LOG_MALLOC YLOG_MALLOC /* deprecated */
+#define LOG_NOTIME YLOG_NOTIME /* do not output date and time */
+#define LOG_APP2 0x00000200 /* Deprecated - not in ylog.h at all*/
+#define LOG_APP3 0x00000400 /* Deprecated - not in ylog.h at all*/
+#define LOG_FLUSH YLOG_FLUSH
+ /* LOG_LOGLVL is a new one in ylog.h. So new that no log.h users should
+ * use it */
-#define LOG_ALL 0xff7f
+#define LOG_ALL YLOG_ALL
-#define LOG_DEFAULT_LEVEL (LOG_FATAL | LOG_ERRNO | LOG_LOG | LOG_WARN)
+#define LOG_DEFAULT_LEVEL YLOG_DEFAULT_LEVEL
-#define logf yaz_log
-YAZ_EXPORT void yaz_log_init(int level, const char *prefix, const char *name);
-YAZ_EXPORT void yaz_log_init_file (const char *fname);
-YAZ_EXPORT void yaz_log_init_level (int level);
-YAZ_EXPORT void yaz_log_init_prefix (const char *prefix);
-YAZ_EXPORT void yaz_log_init_prefix2 (const char *prefix);
+/* logf is deprecated, as it conflicts with a math function */
+#define logf yaz_log
-YAZ_EXPORT void yaz_log(int level, const char *fmt, ...)
-#ifdef __GNUC__
- __attribute__ ((format (printf, 2, 3)))
#endif
- ;
-YAZ_EXPORT int yaz_log_mask_str (const char *str);
-YAZ_EXPORT int yaz_log_mask_str_x (const char *str, int level);
-YAZ_EXPORT FILE *yaz_log_file(void);
-
-YAZ_EXPORT void log_event_start (void (*func)(int level, const char *msg, void *info),
- void *info);
-YAZ_EXPORT void log_event_end (void (*func)(int level, const char *msg, void *info),
- void *info);
-
YAZ_END_CDECL
-
-#endif