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/login | |
| parent | 01771226c202183ff447da712f43d2fad8874484 (diff) | |
| download | systemd-aa8fbc74e3eadf57a15b84cce5778a8eab1d97e6.tar.gz systemd-aa8fbc74e3eadf57a15b84cce5778a8eab1d97e6.tar.bz2 systemd-aa8fbc74e3eadf57a15b84cce5778a8eab1d97e6.zip | |
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/login')
| -rw-r--r-- | src/login/logind-inhibit.c | 2 | ||||
| -rw-r--r-- | src/login/logind-session.c | 2 | ||||
| -rw-r--r-- | src/login/logind-user.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/login/logind-inhibit.c b/src/login/logind-inhibit.c index b1f45baaca..c45c9fd8c3 100644 --- a/src/login/logind-inhibit.c +++ b/src/login/logind-inhibit.c @@ -193,7 +193,7 @@ int inhibitor_load(Inhibitor *i) { char *cc; int r; - r = parse_env_file(NULL, i->state_file, NEWLINE, + r = parse_env_file(NULL, i->state_file, "WHAT", &what, "UID", &uid, "PID", &pid, diff --git a/src/login/logind-session.c b/src/login/logind-session.c index 197154a897..0168fb0352 100644 --- a/src/login/logind-session.c +++ b/src/login/logind-session.c @@ -406,7 +406,7 @@ int session_load(Session *s) { assert(s); - r = parse_env_file(NULL, s->state_file, NEWLINE, + r = parse_env_file(NULL, s->state_file, "REMOTE", &remote, "SCOPE", &s->scope, "SCOPE_JOB", &s->scope_job, diff --git a/src/login/logind-user.c b/src/login/logind-user.c index 0f4c5ccadb..78cfe35a40 100644 --- a/src/login/logind-user.c +++ b/src/login/logind-user.c @@ -312,7 +312,7 @@ int user_load(User *u) { assert(u); - r = parse_env_file(NULL, u->state_file, NEWLINE, + r = parse_env_file(NULL, u->state_file, "SERVICE_JOB", &u->service_job, "STOPPING", &stopping, "REALTIME", &realtime, |