/* 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.
*/
#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>
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, " [");
}
/** 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;
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);
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 */