SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tree-wide: introduce empty_or_dash() helper

Browse Source 
At quite a few places we check isempty() || streq(…, "-"), let's add a
helper to simplify that, and replace that by a single function call.
This commit is contained in:
Lennart Poettering
2019-04-08 12:03:33 +02:00
parent ea505047c5
commit e7b88b7bc1
9 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/sysusers/sysusers.c
+5 -5
View File
@@ -1411,7 +1411,7 @@ static int parse_line(const char *fname, unsigned line, const char *buffer) {
"[%s:%u] Unknown command type '%c'.", fname, line, action[0]);
/* Verify name */
if (isempty(name) || streq(name, "-"))
if (empty_or_dash(name))
name = mfree(name);
if (name) {
@@ -1426,7 +1426,7 @@ static int parse_line(const char *fname, unsigned line, const char *buffer) {
}
/* Verify id */
if (isempty(id) || streq(id, "-"))
if (empty_or_dash(id))
id = mfree(id);
if (id) {
@@ -1437,7 +1437,7 @@ static int parse_line(const char *fname, unsigned line, const char *buffer) {
}
/* Verify description */
if (isempty(description) || streq(description, "-"))
if (empty_or_dash(description))
description = mfree(description);
if (description) {
@@ -1453,7 +1453,7 @@ static int parse_line(const char *fname, unsigned line, const char *buffer) {
}
/* Verify home */
if (isempty(home) || streq(home, "-"))
if (empty_or_dash(home))
home = mfree(home);
if (home) {
@@ -1469,7 +1469,7 @@ static int parse_line(const char *fname, unsigned line, const char *buffer) {
}
/* Verify shell */
if (isempty(shell) || streq(shell, "-"))
if (empty_or_dash(shell))
shell = mfree(shell);
if (shell) {