Fix flags to be unsigned.

diff --git a/conf.c b/conf.c
index d0c3f139c03c56727b1a690a035258c1c5793c05..9baa6de3303c7704424ba4cd1de150a168e41b38 100644 (file)
--- a/conf.c
+++ b/conf.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
 /* -*-c-*-
  *

- * $Id: conf.c,v 1.7 2000/08/01 17:58:10 mdw Exp $
+ * $Id: conf.c,v 1.8 2001/02/03 20:33:26 mdw Exp $

  *
  * Configuration parsing
  *
  *
  * Configuration parsing
  *


@@ -29,6 +29,9 @@
 /*----- Revision history --------------------------------------------------* 
  *
  * $Log: conf.c,v $
 /*----- Revision history --------------------------------------------------* 
  *
  * $Log: conf.c,v $

+ * Revision 1.8  2001/02/03 20:33:26  mdw
+ * Fix flags to be unsigned.
+ *

  * Revision 1.7  2000/08/01 17:58:10  mdw
  * Fix subtleties with <ctype.h> functions.
  *
  * Revision 1.7  2000/08/01 17:58:10  mdw
  * Fix subtleties with <ctype.h> functions.
  *


@@ -380,10 +383,9 @@ int conf_prefix(scanner *sc, const char *p)
 void conf_name(scanner *sc, char delim, dstr *d)
 {
   unsigned f = 0;
 void conf_name(scanner *sc, char delim, dstr *d)
 {
   unsigned f = 0;

-  enum {
-    f_ok = 1,
-    f_bra = 2
-  };
+
+#define f_ok 1u
+#define f_bra 2u

 
   /* --- Read an optional opening bracket --- */
 
 
   /* --- Read an optional opening bracket --- */
 


@@ -421,6 +423,9 @@ void conf_name(scanner *sc, char delim, dstr *d)
       error(sc, "parse error, missing `]'");
   }
   DPUTZ(d);
       error(sc, "parse error, missing `]'");
   }
   DPUTZ(d);

+
+#undef f_ok
+#undef f_bra

 }
 
 /* --- @conf_parse@ --- *
 }
 
 /* --- @conf_parse@ --- *

diff --git a/fw.c b/fw.c
index fdaf9a5cc497ffd95e283cb3af4d473a89d08f0f..3d3f33633db044547c6bb3b339add82a54cd194f 100644 (file)
--- a/fw.c
+++ b/fw.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
 /* -*-c-*-
  *

- * $Id: fw.c,v 1.10 2001/02/03 20:30:03 mdw Exp $
+ * $Id: fw.c,v 1.11 2001/02/03 20:33:26 mdw Exp $

  *
  * Port forwarding thingy
  *
  *
  * Port forwarding thingy
  *


@@ -29,6 +29,9 @@
 /*----- Revision history --------------------------------------------------* 
  *
  * $Log: fw.c,v $
 /*----- Revision history --------------------------------------------------* 
  *
  * $Log: fw.c,v $

+ * Revision 1.11  2001/02/03 20:33:26  mdw
+ * Fix flags to be unsigned.
+ *

  * Revision 1.10  2001/02/03 20:30:03  mdw
  * Support re-reading config files on SIGHUP.
  *
  * Revision 1.10  2001/02/03 20:30:03  mdw
  * Support re-reading config files on SIGHUP.
  *


@@ -432,9 +435,9 @@ int main(int argc, char *argv[])
   conffile *cf, **cff = &conffiles;
 
 #define f_bogus 1u
   conffile *cf, **cff = &conffiles;
 
 #define f_bogus 1u

-#define        f_file 2u
-#define        f_syslog 4u
-#define        f_fork 8u
+#define f_file 2u
+#define f_syslog 4u
+#define f_fork 8u

 
   /* --- Initialize things --- */
 
 
   /* --- Initialize things --- */