shared/conf-parser: remove unnecessary whitespace skipping

The conf-parser machinery already removed whitespace before and after "=", no
need to repeat this step.

The test is adjusted to pass. It was testing an code path that doesn't happen
normally, no point in doing that.

diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c
index 54c71d3579d893a11b09498a62cf96f401c65c73..eaa3b7bf49287375ce779227332c50b5be8442f9 100644 (file)
--- a/src/core/load-fragment.c
+++ b/src/core/load-fragment.c
@@ -614,7 +614,6 @@ int config_parse_exec(
         assert(e);
 
         e += ltype;
-        rvalue += strspn(rvalue, WHITESPACE);
 
         if (isempty(rvalue)) {
                 /* An empty assignment resets the list */
@@ -1951,7 +1950,6 @@ int config_parse_service_timeout_abort(
         assert(rvalue);
         assert(s);
 
-        rvalue += strspn(rvalue, WHITESPACE);
         if (isempty(rvalue)) {
                 s->timeout_abort_set = false;
                 return 0;
@@ -5002,7 +5000,6 @@ int config_parse_timeout_abort(
         assert(rvalue);
         assert(timeout_usec);
 
-        rvalue += strspn(rvalue, WHITESPACE);
         if (isempty(rvalue)) {
                 *timeout_usec = false;
                 return 0;

diff --git a/src/test/test-conf-parser.c b/src/test/test-conf-parser.c
index 597265efa676c947ad89d7902bc20e3b2846c0b1..661eb1795a1fde802bdae39454bcba3b1e35a79a 100644 (file)
--- a/src/test/test-conf-parser.c
+++ b/src/test/test-conf-parser.c
@@ -227,8 +227,8 @@ static const char* const config_file[] = {
         "[Section]\n"
         "[Section]\n"
         "setting1=1\n"
-        "setting1=2\n"
-        "setting1=1\n",      /* repeated settings */
+        "setting1=    2 \t\n"
+        "setting1=    1\n",  /* repeated settings */
 
         "[Section]\n"
         "[Section]\n"

diff --git a/src/test/test-load-fragment.c b/src/test/test-load-fragment.c
index 8d0a4ad2e2c9ed7837f6f2f4b8b5954d93e9ba58..7de286436d3d871c57ea51d8ddb11281978b5d5a 100644 (file)
--- a/src/test/test-load-fragment.c
+++ b/src/test/test-load-fragment.c
@@ -146,7 +146,7 @@ static void test_config_parse_exec(void) {
 
         log_info("/* no command, whitespace only, reset */");
         r = config_parse_exec(NULL, "fake", 3, "section", 1,
-                              "LValue", 0, "    ",
+                              "LValue", 0, "",
                               &c, u);
         assert_se(r == 0);
         assert_se(c == NULL);