Reject invalid quoted strings

[elogind.git] / src / shared / conf-parser.h

diff --git a/src/shared/conf-parser.h b/src/shared/conf-parser.h
index ea7b710dece722b5cecb1ed90c809a579029fa86..a17dde90699b8e5814cc7c2d52e0912b963aa5aa 100644 (file)
--- a/src/shared/conf-parser.h
+++ b/src/shared/conf-parser.h
@@ -170,7 +170,7 @@ int log_syntax_internal(const char *unit, int level,
                      void *userdata) {                                         \
                                                                                \
                 type **enums = data, *xs, x, *ys;                              \
                      void *userdata) {                                         \
                                                                                \
                 type **enums = data, *xs, x, *ys;                              \

-                char *w, *state;                                               \
+                const char *word, *state;                                      \

                 size_t l, i = 0;                                               \
                                                                                \
                 assert(filename);                                              \
                 size_t l, i = 0;                                               \
                                                                                \
                 assert(filename);                                              \


@@ -181,10 +181,10 @@ int log_syntax_internal(const char *unit, int level,
                 xs = new0(type, 1);                                            \
                 *xs = invalid;                                                 \
                                                                                \
                 xs = new0(type, 1);                                            \
                 *xs = invalid;                                                 \
                                                                                \

-                FOREACH_WORD(w, l, rvalue, state) {                            \
+                FOREACH_WORD(word, l, rvalue, state) {                         \

                         _cleanup_free_ char *en = NULL;                        \
                                                                                \
                         _cleanup_free_ char *en = NULL;                        \
                                                                                \

-                        en = strndup(w, l);                                    \
+                        en = strndup(word, l);                                 \

                         if (!en)                                               \
                                 return -ENOMEM;                                \
                                                                                \
                         if (!en)                                               \
                                 return -ENOMEM;                                \
                                                                                \