chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
util: rework /proc/cmdline parser to use unquote_first_word()
[elogind.git]
/
src
/
shared
/
conf-parser.h
diff --git
a/src/shared/conf-parser.h
b/src/shared/conf-parser.h
index ea7b710dece722b5cecb1ed90c809a579029fa86..62f2a01e5e6862294a27a5e64c08fc60401d9ef6 100644
(file)
--- a/
src/shared/conf-parser.h
+++ b/
src/shared/conf-parser.h
@@
-169,8
+169,9
@@
int log_syntax_internal(const char *unit, int level,
void *data, \
void *userdata) { \
\
void *data, \
void *userdata) { \
\
- type **enums = data, *xs, x, *ys; \
- char *w, *state; \
+ type **enums = data, x, *ys; \
+ _cleanup_free_ type *xs = NULL; \
+ const char *word, *state; \
size_t l, i = 0; \
\
assert(filename); \
size_t l, i = 0; \
\
assert(filename); \
@@
-179,12
+180,16
@@
int log_syntax_internal(const char *unit, int level,
assert(data); \
\
xs = new0(type, 1); \
assert(data); \
\
xs = new0(type, 1); \
+ if(!xs) \
+ return -ENOMEM; \
+ \
*xs = invalid; \
\
*xs = invalid; \
\
- FOREACH_WORD(w
, l, rvalue, state) {
\
+ FOREACH_WORD(w
ord, l, rvalue, state) {
\
_cleanup_free_ char *en = NULL; \
_cleanup_free_ char *en = NULL; \
+ type *new_xs; \
\
\
- en = strndup(w
, l);
\
+ en = strndup(w
ord, l);
\
if (!en) \
return -ENOMEM; \
\
if (!en) \
return -ENOMEM; \
\
@@
-208,13
+213,18
@@
int log_syntax_internal(const char *unit, int level,
continue; \
\
*(xs + i) = x; \
continue; \
\
*(xs + i) = x; \
- xs = realloc(xs, (++i + 1) * sizeof(type)); \
- if (!xs) \
+ new_xs = realloc(xs, (++i + 1) * sizeof(type)); \
+ if (new_xs) \
+ xs = new_xs; \
+ else \
return -ENOMEM; \
return -ENOMEM; \
+ \
*(xs + i) = invalid; \
} \
\
free(*enums); \
*enums = xs; \
*(xs + i) = invalid; \
} \
\
free(*enums); \
*enums = xs; \
+ xs = NULL; \
+ \
return 0; \
}
return 0; \
}