summaryrefslogtreecommitdiff
path: root/src/basic
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2018-05-14 09:12:12 +0200
committerSven Eden <yamakuzure@gmx.net>2018-08-24 16:47:08 +0200
commitec8402b80170cdfdaab0698a9eff00a6a9c357ed (patch)
tree994fd00f51d3540a958c6f48aa7eb25d7ee81088 /src/basic
parent8bb71d26a90460ed8e138140c16a71e0f560e0cd (diff)
tree-wide: do not wrap assert_se in extra parentheses
We were inconsitently using them in some cases, but in majority not. Using assignment in assert_se is very common, not an exception like in 'if', so let's drop the extra parens everywhere.
Diffstat (limited to 'src/basic')
-rw-r--r--src/basic/path-util.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/basic/path-util.c b/src/basic/path-util.c
index 5d39cf0d6..957c13bb3 100644
--- a/src/basic/path-util.c
+++ b/src/basic/path-util.c
@@ -692,12 +692,11 @@ int parse_path_argument_and_warn(const char *path, bool suppress_root, char **ar
return log_error_errno(r, "Failed to parse path \"%s\" and make it absolute: %m", path);
path_kill_slashes(p);
- if (suppress_root && empty_or_root(p))
+ if (suppress_root && path_equal(p, "/"))
p = mfree(p);
free(*arg);
*arg = p;
-
return 0;
}
#endif // 0
@@ -928,7 +927,7 @@ int systemd_installation_has_version(const char *root, unsigned minimal_version)
if (r < 0)
return r;
- assert_se((c = endswith(path, "*.so")));
+ assert_se(c = endswith(path, "*.so"));
*c = '\0'; /* truncate the glob part */
STRV_FOREACH(name, names) {