From 177cd18ca296384f19f0f9104973446ed3e841af Mon Sep 17 00:00:00 2001
From: Adam Dickmeiss <adam@indexdata.dk>
Date: Wed, 19 Apr 1995 12:12:02 +0000
Subject: [PATCH] Resource system uses only one log debug level.

---
 include/gw-res.h |    7 ++++++-
 res+log/gw-log.c |    8 ++++++--
 res+log/gw-res.c |   21 ++++++++++++---------
 3 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/include/gw-res.h b/include/gw-res.h
index a7214b4..1543649 100644
--- a/include/gw-res.h
+++ b/include/gw-res.h
@@ -4,7 +4,10 @@
  * Europagate, 1994-1995.
  *
  * $Log: gw-res.h,v $
- * Revision 1.3  1995/02/23 08:32:12  adam
+ * Revision 1.4  1995/04/19 12:12:02  adam
+ * Resource system uses only one log debug level.
+ *
+ * Revision 1.3  1995/02/23  08:32:12  adam
  * Changed header.
  *
  * Revision 1.1.1.1  1995/02/09  17:27:12  adam
@@ -15,6 +18,8 @@
 #ifndef GW_RES_H
 #define GW_RES_H
 
+#define RES_DEBUG GW_LOG_DEBUGN(8)
+
 typedef struct Gw_res_info *GwRes;   /* Gateway resource handle */
 
 GwRes gw_res_init (void);
diff --git a/res+log/gw-log.c b/res+log/gw-log.c
index 3c0a7b7..a7e6558 100644
--- a/res+log/gw-log.c
+++ b/res+log/gw-log.c
@@ -4,7 +4,10 @@
  * Europagate, 1994-1995.
  *
  * $Log: gw-log.c,v $
- * Revision 1.8  1995/04/17 09:36:16  adam
+ * Revision 1.9  1995/04/19 12:12:06  adam
+ * Resource system uses only one log debug level.
+ *
+ * Revision 1.8  1995/04/17  09:36:16  adam
  * Minor changes.
  *
  * Revision 1.7  1995/04/10  13:20:25  adam
@@ -139,6 +142,7 @@ int gw_log (unsigned level_a, const char *event_type, const char *format, ...)
     static char emit_str[2048];
     struct file_mask *list;
     struct timeval tv;
+    struct timezone tz;
     va_list ap;
     unsigned e_level = level_a & level;
     int count;
@@ -150,7 +154,7 @@ int gw_log (unsigned level_a, const char *event_type, const char *format, ...)
         return 0;
 
     va_start (ap, format);
-    gettimeofday (&tv, NULL);
+    gettimeofday (&tv, &tz);
 
     memcpy (&tms, localtime (&tv.tv_sec), sizeof(tms));
     sprintf (emit_str, "%s %d %02d%02d%02d%02d%02d%02d%03d %d %s ",
diff --git a/res+log/gw-res.c b/res+log/gw-res.c
index 722f98b..0031b95 100644
--- a/res+log/gw-res.c
+++ b/res+log/gw-res.c
@@ -4,7 +4,10 @@
  * Europagate, 1994-1995.
  *
  * $Log: gw-res.c,v $
- * Revision 1.5  1995/02/23 08:32:22  adam
+ * Revision 1.6  1995/04/19 12:12:07  adam
+ * Resource system uses only one log debug level.
+ *
+ * Revision 1.5  1995/02/23  08:32:22  adam
  * Changed header.
  *
  * Revision 1.3  1995/02/21  14:00:11  adam
@@ -227,8 +230,8 @@ int gw_res_merge (GwRes id, const char *filename)
 
     assert (id);
     assert (filename);
-    gw_log (GW_LOG_DEBUG, "res", "gw_res_merge");
-    gw_log (GW_LOG_DEBUG, "res", "checking %s", filename);
+    gw_log (RES_DEBUG, "res", "gw_res_merge");
+    gw_log (RES_DEBUG, "res", "checking %s", filename);
     if (!(inf = fopen (filename, "r")))
         return -1;
 #if HAVE_FLOCK
@@ -247,7 +250,7 @@ int gw_res_merge (GwRes id, const char *filename)
         fclose (inf);
         return -2;
     }
-    gw_log (GW_LOG_DEBUG, "res", "reading %s", filename);
+    gw_log (RES_DEBUG, "res", "reading %s", filename);
     ri->next = id->files;
     id->files = ri;
     rlp = &ri->lines;
@@ -349,27 +352,27 @@ int gw_res_merge (GwRes id, const char *filename)
     lock_file (fileno (inf), F_UNLCK);
 #endif
     fclose (inf);
-    gw_log (GW_LOG_DEBUG, "res", "close of %s", filename);
+    gw_log (RES_DEBUG, "res", "close of %s", filename);
     for (rl = ri->lines; rl; rl = rl->next)
     {
         switch (rl->kind)
         {
         case comment:
-            gw_log (GW_LOG_DEBUG, "res", "%s", rl->value);
+            gw_log (RES_DEBUG, "res", "%s", rl->value);
             break;
         case resource:
-            gw_log (GW_LOG_DEBUG, "res", "%s: %s", rl->name, rl->value);
+            gw_log (RES_DEBUG, "res", "%s: %s", rl->name, rl->value);
             if (symtab_override (id->symtab, rl) < 0)
                 err = -2;
             break;
         case blank:
-            gw_log (GW_LOG_DEBUG, "res", "");
+            gw_log (RES_DEBUG, "res", "");
             break;
         default:
             assert (0);
         }
     }
-    gw_log (GW_LOG_DEBUG, "res", "gw_res_merge returned %d", err);
+    gw_log (RES_DEBUG, "res", "gw_res_merge returned %d", err);
     return err;
 }
 
-- 
1.7.10.4