From: Adam Dickmeiss <adam@indexdata.dk>
Date: Thu, 1 May 1997 15:06:42 +0000 (+0000)
Subject: Added log_mask_str_x routine.
X-Git-Tag: YAZ.1.8~667
X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=commitdiff_plain;h=2d978ce2c9706142728e61af13294613b417ec44

Added log_mask_str_x routine.
---

diff --git a/include/log.h b/include/log.h
index 4c8a685..a0dd4cd 100644
--- a/include/log.h
+++ b/include/log.h
@@ -24,7 +24,10 @@
  * OF THIS SOFTWARE.
  *
  * $Log: log.h,v $
- * Revision 1.8  1996-05-01 12:45:00  quinn
+ * Revision 1.9  1997-05-01 15:06:42  adam
+ * Added log_mask_str_x routine.
+ *
+ * Revision 1.8  1996/05/01 12:45:00  quinn
  * *** empty log message ***
  *
  * Revision 1.7  1996/02/05  12:24:26  adam
@@ -82,6 +85,7 @@
 void log_init(int level, const char *prefix, const char *name);
 void logf(int level, const char *fmt, ...);
 int log_mask_str (const char *str);
+int log_mask_str_x (const char *str, int level);
 FILE *log_file(void);
 
 void log_event_start (void (*func)(int level, const char *msg, void *info),
diff --git a/util/log.c b/util/log.c
index 72e48cf..46f74ea 100644
--- a/util/log.c
+++ b/util/log.c
@@ -4,7 +4,10 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: log.c,v $
- * Revision 1.11  1996-02-05 12:24:32  adam
+ * 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
  * Implemented log_event_{start,end}-functions.
  *
  * Revision 1.10  1995/12/06  09:51:27  quinn
@@ -71,6 +74,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <ctype.h>
+#include <string.h>
 #include <stdarg.h>
 #include <errno.h>
 #include <time.h>
@@ -176,8 +180,13 @@ void logf(int level, const char *fmt, ...)
 
 int log_mask_str (const char *str)
 {
+    return log_mask_str_x (str, LOG_DEFAULT_LEVEL);
+}
+
+int log_mask_str_x (const char *str, int level)
+{
     const char *p;
-    int i, level = LOG_DEFAULT_LEVEL;
+    int i;
 
     while (*str)
     {
diff --git a/util/marcdisp.c b/util/marcdisp.c
index 9a33ebf..b915f4f 100644
--- a/util/marcdisp.c
+++ b/util/marcdisp.c
@@ -4,7 +4,10 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: marcdisp.c,v $
- * Revision 1.4  1995-09-29 17:12:34  quinn
+ * Revision 1.5  1997-05-01 15:08:15  adam
+ * Added log_mask_str_x routine.
+ *
+ * Revision 1.4  1995/09/29 17:12:34  quinn
  * Smallish
  *
  * Revision 1.3  1995/09/27  15:03:03  quinn
@@ -51,6 +54,8 @@ int marc_display (const char *buf, FILE *outf)
     int length_starting;
     int length_implementation;
 
+    if (!outf)
+        outf = stdout;
     record_length = atoi_n (buf, 5);
     if (record_length < 25)
         return -1;
diff --git a/util/wrbuf.c b/util/wrbuf.c
index 62ba1a5..a81d950 100644
--- a/util/wrbuf.c
+++ b/util/wrbuf.c
@@ -4,7 +4,10 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: wrbuf.c,v $
- * Revision 1.2  1995-11-01 13:55:06  quinn
+ * Revision 1.3  1997-05-01 15:08:15  adam
+ * Added log_mask_str_x routine.
+ *
+ * Revision 1.2  1995/11/01 13:55:06  quinn
  * Minor adjustments
  *
  * Revision 1.1  1995/10/06  08:51:25  quinn
@@ -18,6 +21,7 @@
  */
 
 #include <stdlib.h>
+#include <string.h>
 
 #include <wrbuf.h>