diff options
| author | Lennart Poettering <lennart@poettering.net> | 2018-11-12 14:04:47 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2018-11-14 17:01:54 +0100 |
| commit | aa8fbc74e3eadf57a15b84cce5778a8eab1d97e6 (patch) | |
| tree | ea8b676c0cfc8d35dd9977d16a6fcf214704200d /src/test/test-unit-file.c | |
| parent | 01771226c202183ff447da712f43d2fad8874484 (diff) | |
| download | systemd-aa8fbc74e3eadf57a15b84cce5778a8eab1d97e6.tar.gz | |
fileio: drop "newline" parameter for env file parsers
Now that we don't (mis-)use the env file parser to parse kernel command
lines there's no need anymore to override the used newline character
set. Let's hence drop the argument and just "\n\r" always. This nicely
simplifies our code.
Diffstat (limited to 'src/test/test-unit-file.c')
| -rw-r--r-- | src/test/test-unit-file.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/test/test-unit-file.c b/src/test/test-unit-file.c index fe6da4fe2d..493ca50220 100644 --- a/src/test/test-unit-file.c +++ b/src/test/test-unit-file.c @@ -531,7 +531,7 @@ static void test_load_env_file_1(void) { assert_se(fd >= 0); assert_se(write(fd, env_file_1, sizeof(env_file_1)) == sizeof(env_file_1)); - r = load_env_file(NULL, name, NULL, &data); + r = load_env_file(NULL, name, &data); assert_se(r == 0); assert_se(streq(data[0], "a=a")); assert_se(streq(data[1], "b=bc")); @@ -553,7 +553,7 @@ static void test_load_env_file_2(void) { assert_se(fd >= 0); assert_se(write(fd, env_file_2, sizeof(env_file_2)) == sizeof(env_file_2)); - r = load_env_file(NULL, name, NULL, &data); + r = load_env_file(NULL, name, &data); assert_se(r == 0); assert_se(streq(data[0], "a=a")); assert_se(data[1] == NULL); @@ -570,7 +570,7 @@ static void test_load_env_file_3(void) { assert_se(fd >= 0); assert_se(write(fd, env_file_3, sizeof(env_file_3)) == sizeof(env_file_3)); - r = load_env_file(NULL, name, NULL, &data); + r = load_env_file(NULL, name, &data); assert_se(r == 0); assert_se(data == NULL); } @@ -585,7 +585,7 @@ static void test_load_env_file_4(void) { assert_se(fd >= 0); assert_se(write(fd, env_file_4, sizeof(env_file_4)) == sizeof(env_file_4)); - r = load_env_file(NULL, name, NULL, &data); + r = load_env_file(NULL, name, &data); assert_se(r == 0); assert_se(streq(data[0], "HWMON_MODULES=coretemp f71882fg")); assert_se(streq(data[1], "MODULE_0=coretemp")); @@ -604,7 +604,7 @@ static void test_load_env_file_5(void) { assert_se(fd >= 0); assert_se(write(fd, env_file_5, sizeof(env_file_5)) == sizeof(env_file_5)); - r = load_env_file(NULL, name, NULL, &data); + r = load_env_file(NULL, name, &data); assert_se(r == 0); assert_se(streq(data[0], "a=")); assert_se(streq(data[1], "b=")); |