Bump version to 2.0.29

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

diff --git a/src/log.c b/src/log.c
index 4ee727c..0c726b6 100644 (file)
--- a/src/log.c
+++ b/src/log.c
@@ -2,7 +2,7 @@
  * Copyright (c) 1995-2004, Index Data
  * See the file LICENSE for details.
  *
- * $Id: log.c,v 1.11 2004-11-03 22:33:17 adam Exp $
+ * $Id: log.c,v 1.13 2004-11-09 20:54:08 adam Exp $
  */
 
 /**
@@ -258,8 +258,10 @@ void yaz_log(int level, const char *fmt, ...)
        {
            if (*mask_names[i].name && mask_names[i].mask && 
                  mask_names[i].mask != LOG_ALL)
+            {
                sprintf(flags + strlen(flags), "[%s]", mask_names[i].name);
-           level -= mask_names[i].mask;
+               level &= ~mask_names[i].mask;
+            }
        }
     va_start(ap, fmt);
 #ifdef WIN32
@@ -318,19 +320,16 @@ void yaz_log_time_format(const char *fmt)
 /** cleans a loglevel name from leading paths and suffixes */
 static char *clean_name(const char *name, int len, char *namebuf, int buflen)
 {
-    char *p;
-    char *start;
+    char *p = namebuf;
+    char *start = namebuf;
     if (buflen <len)
         len = buflen; 
     strncpy(namebuf, name, len);
     namebuf[len] = '\0';
-    start = namebuf;
-    p = namebuf;
-    while ((p = index(start,'/')))
+    while ((p = strchr(start,'/')))
         start = p+1;
-    if ((p = rindex(start,'.')))
+    if ((p = strrchr(start,'.')))
         *p = '\0';
-    /*logf(LOG_LOG,"cleaned '%.*s' to '%s' ", len,name, start); */ 
     return start;
 
 }