X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Flog.c;h=0463a629113bae6d77ca01040ef482a7fd5e70c9;hp=e58e00e7a46546fefe590150a0770e969943bac2;hb=2db517d64ac08da1f812f33812cf58f6aeb905e3;hpb=30be9a32fd26a2d08aa4413942408500c93ad4a3

diff --git a/src/log.c b/src/log.c
index e58e00e..0463a62 100644
--- a/src/log.c
+++ b/src/log.c
@@ -1,5 +1,5 @@
 /* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2009 Index Data
+ * Copyright (C) 1995-2010 Index Data
  * See the file LICENSE for details.
  */
 
@@ -27,7 +27,7 @@
 #include <stdarg.h>
 #include <errno.h>
 #include <time.h>
-#include <yaz/nmem.h>
+#include <yaz/errno.h>
 #include <yaz/log.h>
 #include <yaz/snprintf.h>
 #include <yaz/xmalloc.h>
@@ -452,7 +452,7 @@ void yaz_log(int level, const char *fmt, ...)
 
     if (o_level & YLOG_ERRNO)
     {
-        int remain = sizeof(buf) - strlen(buf);
+        size_t remain = sizeof(buf) - strlen(buf);
         if (remain > 100) /* reasonable minimum space for error */
         {
             strcat(buf, " [");
@@ -491,7 +491,7 @@ 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)
+static char *clean_name(const char *name, size_t len, char *namebuf, size_t buflen)
 {
     char *p = namebuf;
     char *start = namebuf;
@@ -508,19 +508,19 @@ static char *clean_name(const char *name, int len, char *namebuf, int buflen)
 
 static int define_module_bit(const char *name)
 {
-    int i;
+    size_t i;
 
     for (i = 0; mask_names[i].name; i++)
         if (0 == strcmp(mask_names[i].name, name))
         {
             return mask_names[i].mask;
         }
-    if ( (i>=MAX_MASK_NAMES) || (next_log_bit & (1<<31) ))
+    if ( (i>=MAX_MASK_NAMES) || (next_log_bit & (1U<<31) ))
     {
         yaz_log(YLOG_WARN, "No more log bits left, not logging '%s'", name);
         return 0;
     }
-    mask_names[i].mask = next_log_bit;
+    mask_names[i].mask = (int) next_log_bit; /* next_log_bit can hold int */
     next_log_bit = next_log_bit<<1;
     mask_names[i].name = (char *) malloc(strlen(name)+1);
     strcpy(mask_names[i].name, name);
@@ -577,7 +577,7 @@ int yaz_log_mask_str_x(const char *str, int level)
         else 
         {
             char clean[509];
-            char *n = clean_name(str, p-str, clean, sizeof(clean));
+            char *n = clean_name(str, (size_t) (p - str), clean, sizeof(clean));
             int mask = define_module_bit(n);
             if (!mask)
                 level = 0;  /* 'none' clears them all */