X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Flog.c;h=ced99c5b70ce38776c349501171a86abcf69a3c2;hb=be821514c869d68186361b5aab6bbfd1aa60e087;hp=2708bb457c1222d3118a01e33321a34b5c1b1229;hpb=8d691989077a0addcbd840d769dce6700f3d9622;p=yaz-moved-to-github.git

diff --git a/src/log.c b/src/log.c
index 2708bb4..ced99c5 100644
--- a/src/log.c
+++ b/src/log.c
@@ -2,7 +2,7 @@
  * Copyright (C) 1995-2007, Index Data ApS
  * See the file LICENSE for details.
  *
- * $Id: log.c,v 1.45 2007-01-03 08:42:15 adam Exp $
+ * $Id: log.c,v 1.49 2007-03-22 09:13:13 adam Exp $
  */
 
 /**
@@ -36,6 +36,7 @@
 #include <time.h>
 #include <yaz/nmem.h>
 #include <yaz/log.h>
+#include <yaz/snprintf.h>
 #include <yaz/xmalloc.h>
 
 static NMEM_MUTEX log_mutex = 0;
@@ -388,9 +389,10 @@ static void yaz_strftime(char *dst, size_t sz,
 #ifdef WIN32
         DWORD tid = GetCurrentThreadId();
 #else
-        long tid = 0;
 #if YAZ_POSIX_THREADS
-        tid = pthread_self();
+        pthread_t tid = pthread_self();
+#else
+        long tid = 0;
 #endif
 #endif
         memcpy(fmt2, fmt, cp-fmt);
@@ -444,14 +446,16 @@ static void yaz_log_to_file(int level, const char *log_message)
                     level &= ~mask_names[i].mask;
                 }
             }
-        
-        if (l_level & YLOG_NOTIME)
-            tbuf[0] = '\0';
-        else
-            yaz_strftime(tbuf, TIMEFORMAT_LEN-1, l_actual_format, tm);
-        tbuf[TIMEFORMAT_LEN-1] = '\0';
-        
-        fprintf(file, "%s %s%s %s%s\n", tbuf, l_prefix, flags, l_prefix2,
+       
+        tbuf[0] = '\0';
+        if (!(l_level & YLOG_NOTIME))
+        {
+            yaz_strftime(tbuf, TIMEFORMAT_LEN-2, l_actual_format, tm);
+            tbuf[TIMEFORMAT_LEN-2] = '\0';
+        }
+        if (tbuf[0])
+            strcat(tbuf, " ");
+        fprintf(file, "%s%s%s %s%s\n", tbuf, l_prefix, flags, l_prefix2,
                 log_message);
         if (l_level & YLOG_FLUSH)
             fflush(file);
@@ -470,17 +474,8 @@ void yaz_log(int level, const char *fmt, ...)
     if (!(level & l_level))
         return;
     va_start(ap, fmt);
-#ifdef WIN32
-    _vsnprintf(buf, sizeof(buf)-1, fmt, ap);
-#else
-/* !WIN32 */
-#if HAVE_VSNPRINTF
-    vsnprintf(buf, sizeof(buf), fmt, ap);
-#else
-    vsprintf(buf, fmt, ap);
-#endif
-#endif
-/* WIN32 */
+
+    yaz_vsnprintf(buf, sizeof(buf)-1, fmt, ap);
     if (o_level & YLOG_ERRNO)
     {
         strcat(buf, " [");