X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fshared%2Fconf-parser.c;h=0f6bf85b0386809443bc3bdb3029b6445ea11ed1;hp=92baba60378a1c2d7b706a673786f301baab1b4d;hb=a61ff8a1eea921800d6225ff137b24e0a0fb60e1;hpb=0b4e594c9274e03cd8ab03a17a449d2f98c8e260

diff --git a/src/shared/conf-parser.c b/src/shared/conf-parser.c
index 92baba603..0f6bf85b0 100644
--- a/src/shared/conf-parser.c
+++ b/src/shared/conf-parser.c
@@ -100,7 +100,7 @@ int config_item_perf_lookup(
         else {
                 char *key;
 
-                key = strjoin(section, ".", lvalue, NULL);
+                key = strjoin(section, ".", lvalue);
                 if (!key)
                         return -ENOMEM;
 
@@ -443,6 +443,7 @@ int config_parse_many_nulstr(
                                        sections, lookup, table, relaxed, userdata);
 }
 
+#if 0 /// UNNEEDED by elogind
 /* Parse each config file in the directories specified as strv. */
 int config_parse_many(
                 const char *conf_file,
@@ -471,6 +472,7 @@ int config_parse_many(
         return config_parse_many_files(conf_file, files,
                                        sections, lookup, table, relaxed, userdata);
 }
+#endif // 0
 
 #define DEFINE_PARSER(type, vartype, conv_func)                         \
         int config_parse_##type(                                        \
@@ -505,8 +507,10 @@ int config_parse_many(
 
 DEFINE_PARSER(int, int, safe_atoi);
 DEFINE_PARSER(long, long, safe_atoli);
+#if 0 /// UNNEEDED by elogind
 DEFINE_PARSER(uint16, uint16_t, safe_atou16);
 DEFINE_PARSER(uint32, uint32_t, safe_atou32);
+#endif // 0
 DEFINE_PARSER(uint64, uint64_t, safe_atou64);
 DEFINE_PARSER(unsigned, unsigned, safe_atou);
 DEFINE_PARSER(double, double, safe_atod);
@@ -786,7 +790,7 @@ int config_parse_strv(const char *unit,
         for (;;) {
                 char *word = NULL;
 
-                r = extract_first_word(&rvalue, &word, WHITESPACE, EXTRACT_QUOTES|EXTRACT_RETAIN_ESCAPE);
+                r = extract_first_word(&rvalue, &word, NULL, EXTRACT_QUOTES|EXTRACT_RETAIN_ESCAPE);
                 if (r == 0)
                         break;
                 if (r == -ENOMEM)