projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Ignore generated file tstlog
[yaz-moved-to-github.git]
/
src
/
log.c
diff --git
a/src/log.c
b/src/log.c
index
f6690e5
..
e8aa1a8
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.
*
* Copyright (c) 1995-2004, Index Data
* See the file LICENSE for details.
*
- * $Id: log.c,v 1.16 2004-11-18 15:18:13 heikki Exp $
+ * $Id: log.c,v 1.19 2004-12-30 00:11:00 adam Exp $
*/
/**
*/
/**
@@
-34,7
+34,8
@@
#include <errno.h>
#include <time.h>
#include <yaz/nmem.h>
#include <errno.h>
#include <time.h>
#include <yaz/nmem.h>
-#include <yaz/ylog.h>
+#include <yaz/log.h>
+#include <yaz/xmalloc.h>
static NMEM_MUTEX log_mutex = 0;
static int mutex_init_flag = 0; /* not yet initialized */
static NMEM_MUTEX log_mutex = 0;
static int mutex_init_flag = 0; /* not yet initialized */
@@
-83,7
+84,7
@@
static struct {
{ YLOG_ERRNO, ""},
{ YLOG_MALLOC, "malloc"},
/* { YLOG_APP, "app" }, */
{ YLOG_ERRNO, ""},
{ YLOG_MALLOC, "malloc"},
/* { YLOG_APP, "app" }, */
- { YLOG_NOTIME, "" },
+ { YLOG_NOTIME, "notime" },
/* { YLOG_APP2, "app2" }, */
/* { YLOG_APP3, "app3" }, */
{ YLOG_ALL, "all" },
/* { YLOG_APP2, "app2" }, */
/* { YLOG_APP3, "app3" }, */
{ YLOG_ALL, "all" },
@@
-396,15
+397,13
@@
int yaz_log_mask_str_x (const char *str, int level)
{
const char *p;
int i;
{
const char *p;
int i;
- int found;
- int negated;
char clean[255] = "";
char *n = clean;
while (*str)
{
char clean[255] = "";
char *n = clean;
while (*str)
{
- found = 0;
- negated=0;
+ int found = 0;
+ int negated = 0;
for (p = str; *p && *p != ','; p++)
;
if (*str=='-')
for (p = str; *p && *p != ','; p++)
;
if (*str=='-')
@@
-412,7
+411,7
@@
int yaz_log_mask_str_x (const char *str, int level)
negated=1;
str++;
}
negated=1;
str++;
}
- if (isdigit(*str))
+ if (isdigit(*(unsigned char *) str))
{
level = atoi (str);
found = 1;
{
level = atoi (str);
found = 1;