diff options
author | Lennart Poettering <lennart@poettering.net> | 2017-10-27 11:15:20 +0200 |
---|---|---|
committer | Sven Eden <yamakuzure@gmx.net> | 2017-10-27 11:15:20 +0200 |
commit | 4202cc314f48f65da506425107baf55e13278d8e (patch) | |
tree | e117a9d7bcaec04b4a13ea249c618413bf2bd9c6 /src | |
parent | 49505552890aed8efee7f4c109d874520f2d0d29 (diff) |
proc-cmdline: minor runlevel_to_target() coding style fixes
Let's not mix function calls and variable declarations, as well as
assignments and comparison in one expression.
Diffstat (limited to 'src')
-rw-r--r-- | src/basic/proc-cmdline.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/src/basic/proc-cmdline.c b/src/basic/proc-cmdline.c index e2eba45a3..8d4edb1cf 100644 --- a/src/basic/proc-cmdline.c +++ b/src/basic/proc-cmdline.c @@ -273,17 +273,21 @@ static const char * const rlmap_initrd[] = { }; const char* runlevel_to_target(const char *word) { + const char * const *rlmap_ptr; size_t i; - const char * const *rlmap_ptr = in_initrd() ? rlmap_initrd - : rlmap; if (!word) return NULL; - if (in_initrd() && (word = startswith(word, "rd.")) == NULL) - return NULL; + if (in_initrd()) { + word = startswith(word, "rd."); + if (!word) + return NULL; + } + + rlmap_ptr = in_initrd() ? rlmap_initrd : rlmap; - for (i = 0; rlmap_ptr[i] != NULL; i += 2) + for (i = 0; rlmap_ptr[i]; i += 2) if (streq(word, rlmap_ptr[i])) return rlmap_ptr[i+1]; |