Minor change to order of debugging output for send_apdu,

[yaz-moved-to-github.git] / util / log.c

diff --git a/util/log.c b/util/log.c
index f6b1185..53b85d3 100644 (file)
--- a/util/log.c
+++ b/util/log.c
@@ -1,10 +1,25 @@
 /*
- * Copyright (c) 1995-1997, Index Data
+ * Copyright (c) 1995-2000, Index Data
  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: log.c,v $
- * Revision 1.18  1998-10-28 10:27:00  adam
+ * Revision 1.23  2000-03-14 09:06:11  adam
+ * Added POSIX threads support for frontend server.
+ *
+ * Revision 1.22  2000/02/29 13:44:55  adam
+ * Check for config.h (currently not generated).
+ *
+ * Revision 1.21  2000/02/28 11:20:06  adam
+ * Using autoconf. New definitions: YAZ_BEGIN_CDECL/YAZ_END_CDECL.
+ *
+ * Revision 1.20  1999/11/30 13:47:12  adam
+ * Improved installation. Moved header files to include/yaz.
+ *
+ * Revision 1.19  1999/08/27 09:40:32  adam
+ * Renamed logf function to yaz_log. Removed VC++ project files.
+ *
+ * Revision 1.18  1998/10/28 10:27:00  adam
  * New functions log_init_file, log_init_level, log_init_prefix.
  *
  * Revision 1.17  1997/12/09 16:11:02  adam
@@ -90,6 +105,10 @@
  *
  */
 
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <ctype.h>
@@ -97,7 +116,7 @@
 #include <stdarg.h>
 #include <errno.h>
 #include <time.h>
-#include <log.h>
+#include <yaz/log.h>
 
 #define HAS_STRERROR 1
 
@@ -190,7 +209,7 @@ void log_event_end (void (*func)(int, const char *, void *), void *info)
     end_hook_info = info;
 }
 
-void logf(int level, const char *fmt, ...)
+void yaz_log(int level, const char *fmt, ...)
 {
     va_list ap;
     char buf[4096], flags[1024];
@@ -213,7 +232,11 @@ void logf(int level, const char *fmt, ...)
            level -= mask_names[i].mask;
        }
     va_start(ap, fmt);
+#if HAVE_VSNPRINTF
+    vsnprintf(buf, sizeof(buf), fmt, ap);
+#else
     vsprintf(buf, fmt, ap);
+#endif
     if (o_level & LOG_ERRNO)
        sprintf(buf + strlen(buf), " [%s]", strerror(errno));
     if (start_hook_func)