X-Git-Url: https://git.distorted.org.uk/~mdw/fwd/blobdiff_plain/827937594af083b860203b9872d7171033954dee..d1c182e7ea23547f2da0f621248fae25b8080af9:/conf.c

diff --git a/conf.c b/conf.c
index 3211db1..9baa6de 100644
--- a/conf.c
+++ b/conf.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: conf.c,v 1.5 1999/10/22 22:46:44 mdw Exp $
+ * $Id: conf.c,v 1.8 2001/02/03 20:33:26 mdw Exp $
  *
  * Configuration parsing
  *
@@ -29,6 +29,15 @@
 /*----- 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.6  2000/02/12 18:13:20  mdw
+ * Terminate tables of sources and targets.
+ *
  * Revision 1.5  1999/10/22 22:46:44  mdw
  * Improve documentation for conf_enum.
  *
@@ -73,8 +82,10 @@
 
 /*----- Source and target tables ------------------------------------------*/
 
-static source_ops *sources[] = { &xsource_ops, &fsource_ops, &ssource_ops };
-static target_ops *targets[] = { &xtarget_ops, &ftarget_ops, &starget_ops };
+static source_ops *sources[] =
+  { &xsource_ops, &fsource_ops, &ssource_ops, 0 };
+static target_ops *targets[] =
+  { &xtarget_ops, &ftarget_ops, &starget_ops, 0 };
 
 static const char *notword = 0;
 static const char *notdelim = 0;
@@ -129,7 +140,7 @@ int token(scanner *sc)
       goto done;
     }
 
-    else if (isspace((unsigned char)ch))
+    else if (isspace(ch))
       ;
     else switch (ch) {
 
@@ -182,7 +193,7 @@ int token(scanner *sc)
 		goto insert;
 	      goto word;
 	    default:
-	      if (!q && isspace((unsigned char)(ch)))
+	      if (!q && isspace(ch))
 		goto word;
 	    insert:
 	      DPUTC(&sc->d, ch);
@@ -372,10 +383,9 @@ int conf_prefix(scanner *sc, const char *p)
 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 --- */
 
@@ -413,6 +423,9 @@ void conf_name(scanner *sc, char delim, dstr *d)
       error(sc, "parse error, missing `]'");
   }
   DPUTZ(d);
+
+#undef f_ok
+#undef f_bra
 }
 
 /* --- @conf_parse@ --- *