diff options
| author | Lennart Poettering <lennart@poettering.net> | 2018-03-23 21:31:14 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2018-05-24 17:01:57 +0200 |
| commit | 1a5a177eafa72adfd40916be05f35b71011014b0 (patch) | |
| tree | df4d3504ef6ea99aaf75f9cce66a3dc3127fc296 /src/locale/localectl.c | |
| parent | e2047ba9ed68aa223715f25e156aeb0665c884ce (diff) | |
| download | systemd-1a5a177eafa72adfd40916be05f35b71011014b0.tar.gz | |
fileio: accept FILE* in addition to path in parse_env_file()
Most our other parsing functions do this, let's do this here too,
internally we accept that anyway. Also, the closely related
load_env_file() and load_env_file_pairs() also do this, so let's be
systematic.
Diffstat (limited to 'src/locale/localectl.c')
| -rw-r--r-- | src/locale/localectl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/locale/localectl.c b/src/locale/localectl.c index 473b28de4d..49a44ae8bb 100644 --- a/src/locale/localectl.c +++ b/src/locale/localectl.c @@ -61,7 +61,7 @@ static void print_overridden_variables(void) { if (detect_container() > 0 || arg_host) return; - r = parse_env_file("/proc/cmdline", WHITESPACE, + r = parse_env_file(NULL, "/proc/cmdline", WHITESPACE, "locale.LANG", &variables[VARIABLE_LANG], "locale.LANGUAGE", &variables[VARIABLE_LANGUAGE], "locale.LC_CTYPE", &variables[VARIABLE_LC_CTYPE], |