Slightly improve the checking of the 'size' field, so people will get
a warning message if they switch the values for 'size' and 'when'. MFC after: 1 week
This commit is contained in:
parent
900a41ee73
commit
bedb455962
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=114762
@ -155,6 +155,7 @@ static time_t parseDWM(char *s, char *errline);
|
|||||||
* range 0 to 255, plus EOF. Define wrappers which can take
|
* range 0 to 255, plus EOF. Define wrappers which can take
|
||||||
* values of type 'char', either signed or unsigned.
|
* values of type 'char', either signed or unsigned.
|
||||||
*/
|
*/
|
||||||
|
#define isdigitch(Anychar) isdigit(((int) Anychar) & 255)
|
||||||
#define isprintch(Anychar) isprint(((int) Anychar) & 255)
|
#define isprintch(Anychar) isprint(((int) Anychar) & 255)
|
||||||
#define isspacech(Anychar) isspace(((int) Anychar) & 255)
|
#define isspacech(Anychar) isspace(((int) Anychar) & 255)
|
||||||
#define tolowerch(Anychar) tolower(((int) Anychar) & 255)
|
#define tolowerch(Anychar) tolower(((int) Anychar) & 255)
|
||||||
@ -949,10 +950,15 @@ parse_file(FILE *cf, const char *cfname, struct conf_entry **work_p,
|
|||||||
errx(1, "malformed line (missing fields):\n%s",
|
errx(1, "malformed line (missing fields):\n%s",
|
||||||
errline);
|
errline);
|
||||||
*parse = '\0';
|
*parse = '\0';
|
||||||
if (isdigit(*q))
|
if (isdigitch(*q))
|
||||||
working->size = atoi(q);
|
working->size = atoi(q);
|
||||||
else
|
else if (strcmp(q,"*") == 0)
|
||||||
working->size = -1;
|
working->size = -1;
|
||||||
|
else {
|
||||||
|
warnx("Invalid value of '%s' for 'size' in line:\n%s",
|
||||||
|
q, errline);
|
||||||
|
working->size = -1;
|
||||||
|
}
|
||||||
|
|
||||||
working->flags = 0;
|
working->flags = 0;
|
||||||
q = parse = missing_field(sob(++parse), errline);
|
q = parse = missing_field(sob(++parse), errline);
|
||||||
|
Loading…
Reference in New Issue
Block a user