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/machine/machine.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/machine/machine.c')
| -rw-r--r-- | src/machine/machine.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/machine/machine.c b/src/machine/machine.c index 008bbbc3f4..f57984a0c2 100644 --- a/src/machine/machine.c +++ b/src/machine/machine.c @@ -255,7 +255,7 @@ int machine_load(Machine *m) { if (!m->state_file) return 0; - r = parse_env_file(m->state_file, NEWLINE, + r = parse_env_file(NULL, m->state_file, NEWLINE, "SCOPE", &m->unit, "SCOPE_JOB", &m->scope_job, "SERVICE", &m->service, |