~mdw
/
fwd
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
New @conn_init@ interface.
[fwd]
/
conf.c
diff --git
a/conf.c
b/conf.c
index
dfc3765
..
9baa6de
100644
(file)
--- a/
conf.c
+++ b/
conf.c
@@
-1,6
+1,6
@@
/* -*-c-*-
*
/* -*-c-*-
*
- * $Id: conf.c,v 1.
6 2000/02/12 18:13:20
mdw Exp $
+ * $Id: conf.c,v 1.
8 2001/02/03 20:33:26
mdw Exp $
*
* Configuration parsing
*
*
* Configuration parsing
*
@@
-29,6
+29,12
@@
/*----- 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.6 2000/02/12 18:13:20 mdw
* Terminate tables of sources and targets.
*
* Revision 1.6 2000/02/12 18:13:20 mdw
* Terminate tables of sources and targets.
*
@@
-134,7
+140,7
@@
int token(scanner *sc)
goto done;
}
goto done;
}
- else if (isspace(
(unsigned char)
ch))
+ else if (isspace(ch))
;
else switch (ch) {
;
else switch (ch) {
@@
-187,7
+193,7
@@
int token(scanner *sc)
goto insert;
goto word;
default:
goto insert;
goto word;
default:
- if (!q && isspace(
(unsigned char)(ch)
))
+ if (!q && isspace(
ch
))
goto word;
insert:
DPUTC(&sc->d, ch);
goto word;
insert:
DPUTC(&sc->d, ch);
@@
-377,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 --- */
@@
-418,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@ --- *