picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use extract_first_word() in generated conf parsers

This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2020-07-31 12:07:49 +02:00
parent 087908c140
commit ecaf258eb4
1 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/shared/conf-parser.h
View File

@ -239,10 +239,10 @@ typedef enum Disabled {
#define DEFINE_CONFIG_PARSE_ENUMV(function, name, type, invalid, msg) \ #define DEFINE_CONFIG_PARSE_ENUMV(function, name, type, invalid, msg) \
CONFIG_PARSER_PROTOTYPE(function) { \ CONFIG_PARSER_PROTOTYPE(function) { \
type **enums = data, x, *ys; \ type **enums = data; \
_cleanup_free_ type *xs = NULL; \ _cleanup_free_ type *xs = NULL; \
const char *word, *state; \ size_t i = 0; \
size_t l, i = 0; \ int r; \
\ \
assert(filename); \ assert(filename); \
assert(lvalue); \ assert(lvalue); \
@ -255,29 +255,32 @@ typedef enum Disabled {
\ \
*xs = invalid; \ *xs = invalid; \
\ \
FOREACH_WORD(word, l, rvalue, state) { \ for (const char *p = rvalue;;) { \
_cleanup_free_ char *en = NULL; \ _cleanup_free_ char *en = NULL; \
type *new_xs; \ type x, *new_xs; \
\ \
en = strndup(word, l); \ r = extract_first_word(&p, &en, NULL, 0); \
if (!en) \ if (r == -ENOMEM) \
return log_oom(); \ return log_oom(); \
if (r < 0) \
return log_syntax(unit, LOG_ERR, filename, line, 0, \
msg ": %s", en); \
if (r == 0) \
break; \
\ \
if ((x = name##_from_string(en)) < 0) { \ if ((x = name##_from_string(en)) < 0) { \
log_syntax(unit, LOG_WARNING, filename, line, 0, \ log_syntax(unit, LOG_WARNING, filename, line, 0, \
msg ", ignoring: %s", en); \ msg ", ignoring: %s", en); \
continue; \ continue; \
} \ } \
\ \
for (ys = xs; x != invalid && *ys != invalid; ys++) { \ for (type *ys = xs; x != invalid && *ys != invalid; ys++) \
if (*ys == x) { \ if (*ys == x) { \
log_syntax(unit, LOG_NOTICE, filename, \ log_syntax(unit, LOG_NOTICE, filename, line, 0, \
line, 0, \ "Duplicate entry, ignoring: %s", \
"Duplicate entry, ignoring: %s", \
en); \ en); \
x = invalid; \ x = invalid; \
} \ } \
} \
\ \
if (x == invalid) \ if (x == invalid) \
continue; \ continue; \
@ -292,6 +295,5 @@ typedef enum Disabled {
*(xs + i) = invalid; \ *(xs + i) = invalid; \
} \ } \
\ \
free_and_replace(*enums, xs); \ return free_and_replace(*enums, xs); \
return 0; \
} }