From ff922b481d88c83594c4a97352067f5b17b74e67 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 23 Mar 2018 21:31:14 +0100 Subject: 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. --- src/login/logind-inhibit.c | 2 +- src/login/logind-session.c | 2 +- src/login/logind-user.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/login') diff --git a/src/login/logind-inhibit.c b/src/login/logind-inhibit.c index 0938f2f10..8bf3e72d2 100644 --- a/src/login/logind-inhibit.c +++ b/src/login/logind-inhibit.c @@ -198,7 +198,7 @@ int inhibitor_load(Inhibitor *i) { char *cc; int r; - r = parse_env_file(i->state_file, NEWLINE, + r = parse_env_file(NULL, i->state_file, NEWLINE, "WHAT", &what, "UID", &uid, "PID", &pid, diff --git a/src/login/logind-session.c b/src/login/logind-session.c index 857f43827..e5adbdcf7 100644 --- a/src/login/logind-session.c +++ b/src/login/logind-session.c @@ -372,7 +372,7 @@ int session_load(Session *s) { assert(s); - r = parse_env_file(s->state_file, NEWLINE, + r = parse_env_file(NULL, s->state_file, NEWLINE, "REMOTE", &remote, "SCOPE", &s->scope, #if 0 /// elogind does not support systemd scope_jobs diff --git a/src/login/logind-user.c b/src/login/logind-user.c index b7bac297c..57c4b8ca9 100644 --- a/src/login/logind-user.c +++ b/src/login/logind-user.c @@ -291,7 +291,7 @@ int user_load(User *u) { assert(u); - r = parse_env_file(u->state_file, NEWLINE, + r = parse_env_file(NULL, u->state_file, NEWLINE, #if 0 /// elogind neither supports service nor slice jobs "SERVICE_JOB", &u->service_job, "SLICE_JOB", &u->slice_job, -- cgit v1.2.3