X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=include%2Fyaz%2Flog.h;h=0c3bcf9bfb62c5596e4c7c4c8107782c9b70ef8b;hb=43801085d371c69455730182f72c4e53d8c8218f;hp=35e4a80b378f567000e3e48ddfb483703fcda8d8;hpb=d9ee01635f03f9095a66f71b73580560d48798e8;p=yaz-moved-to-github.git

diff --git a/include/yaz/log.h b/include/yaz/log.h
index 35e4a80..0c3bcf9 100644
--- a/include/yaz/log.h
+++ b/include/yaz/log.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995-1999, Index Data.
+ * Copyright (c) 1995-2000, 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,
@@ -24,7 +24,17 @@
  * OF THIS SOFTWARE.
  *
  * $Log: log.h,v $
- * Revision 1.1  1999-11-30 13:47:11  adam
+ * Revision 1.4  2000-09-04 08:58:15  adam
+ * Added prefix yaz_ for most logging utility functions.
+ *
+ * Revision 1.3  2000/06/09 13:51:01  ian
+ * Added LOG_APP for logging application (Rather than code) events that might
+ * be useful when creating usage reports.
+ *
+ * Revision 1.2  2000/02/28 11:20:06  adam
+ * Using autoconf. New definitions: YAZ_BEGIN_CDECL/YAZ_END_CDECL.
+ *
+ * Revision 1.1  1999/11/30 13:47:11  adam
  * Improved installation. Moved header files to include/yaz.
  *
  * Revision 1.15  1999/08/27 09:40:32  adam
@@ -94,9 +104,7 @@
 #include <yaz/yconfig.h>
 #include <yaz/xmalloc.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+YAZ_BEGIN_CDECL
 
 #define LOG_FATAL 0x0001
 #define LOG_DEBUG 0x0002
@@ -104,6 +112,7 @@ extern "C" {
 #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_ALL   0xffff
 
@@ -111,27 +120,25 @@ extern "C" {
 
 #define logf yaz_log
 
-YAZ_EXPORT void log_init(int level, const char *prefix, const char *name);
-YAZ_EXPORT void log_init_file (const char *fname);
-YAZ_EXPORT void log_init_level (int level);
-YAZ_EXPORT void log_init_prefix (const char *prefix);
+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(int level, const char *fmt, ...)
 #ifdef __GNUC__
 	__attribute__ ((format (printf, 2, 3)))
 #endif
 	;
-YAZ_EXPORT int log_mask_str (const char *str);
-YAZ_EXPORT int log_mask_str_x (const char *str, int level);
-YAZ_EXPORT FILE *log_file(void);
+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);
 
-#ifdef __cplusplus
-}
-#endif
+YAZ_END_CDECL
 
 #endif