X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;ds=sidebyside;f=util%2Flog.c;h=afba6ec406ff7d61565cdeb2b53ba5830a729725;hb=84e4c0195cfd14430102ccb7bc9deeb8951b55d1;hp=46f74ea8e77c017299ad68f28030bd2fec12abaa;hpb=2d978ce2c9706142728e61af13294613b417ec44;p=yaz-moved-to-github.git

diff --git a/util/log.c b/util/log.c
index 46f74ea..afba6ec 100644
--- a/util/log.c
+++ b/util/log.c
@@ -1,10 +1,20 @@
 /*
- * Copyright (c) 1995, Index Data
+ * Copyright (c) 1995-1997, Index Data
  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: log.c,v $
- * Revision 1.12  1997-05-01 15:08:14  adam
+ * Revision 1.15  1997-09-29 07:13:13  adam
+ * Minor changes.
+ *
+ * Revision 1.14  1997/09/18 08:48:09  adam
+ * Fixed minor bug that caused log_init to ignore filename.
+ *
+ * Revision 1.13  1997/09/01 08:54:13  adam
+ * New windows NT/95 port using MSV5.0. Made prefix query handling
+ * thread safe. The function options ignores empty arguments when met.
+ *
+ * Revision 1.12  1997/05/01 15:08:14  adam
  * Added log_mask_str_x routine.
  *
  * Revision 1.11  1996/02/05 12:24:32  adam
@@ -81,7 +91,7 @@
 #include <log.h>
 
 static int l_level = LOG_DEFAULT_LEVEL;
-static FILE *l_file = stderr;
+static FILE *l_file = NULL;
 static char l_prefix[512] = "log";
 
 static struct {
@@ -99,8 +109,9 @@ static struct {
     { 0, NULL }
 };  
 
-#ifndef strerror
 
+#ifndef strerror
+#ifndef WINDOWS
 char *strerror(int n)
 {
         extern char *sys_errlist[];
@@ -108,6 +119,7 @@ char *strerror(int n)
 }
 
 #endif
+#endif
 
 FILE *log_file(void)
 {
@@ -119,7 +131,9 @@ void log_init(int level, const char *prefix, const char *name)
     l_level = level;
     if (prefix && *prefix)
     	sprintf(l_prefix, "%.512s", prefix);
-    if (!name || !*name || l_file != stderr)
+    if (!name || !*name)
+        return;
+    if (l_file != stderr && l_file != 0)
 	return;
     if (!(l_file = fopen(name, "a")))
         return;
@@ -127,9 +141,9 @@ void log_init(int level, const char *prefix, const char *name)
 }
 
 static void (*start_hook_func)(int, const char *, void *) = NULL;
-void *start_hook_info;
+static void *start_hook_info;
 static void (*end_hook_func)(int, const char *, void *) = NULL;
-void *end_hook_info;
+static void *end_hook_info;
 
 void log_event_start (void (*func)(int, const char *, void *), void *info)
 {
@@ -155,6 +169,8 @@ void logf(int level, const char *fmt, ...)
 
     if (!(level & l_level))
     	return;
+    if (!l_file)
+        l_file = stderr;
     *flags = '\0';
     for (i = 0; level && mask_names[i].name; i++)
     	if (mask_names[i].mask & level)
@@ -196,7 +212,7 @@ int log_mask_str_x (const char *str, int level)
             level = atoi (str);
         else
             for (i = 0; mask_names[i].name; i++)
-                if (strlen (mask_names[i].name) == p-str &&
+                if (strlen (mask_names[i].name) == (size_t) (p-str) &&
                     memcmp (mask_names[i].name, str, p-str) == 0)
                 {
                     if (mask_names[i].mask)