summaryrefslogtreecommitdiff
path: root/src/basic/os-util.c
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2021-03-07 12:15:42 +0100
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2021-03-07 12:15:42 +0100
commit9e8a392a9ac1828b246550ec3056759b703fee6f (patch)
tree07ac0b8c8e39e6b8c87a47d447918a314c993f2e /src/basic/os-util.c
parent60d9c4f3b972ce70dfadc0a3f1a478a056c2ea7a (diff)
downloadsystemd-9e8a392a9ac1828b246550ec3056759b703fee6f.tar.gz
basic/os-util: adjust indentation
Diffstat (limited to 'src/basic/os-util.c')
-rw-r--r--src/basic/os-util.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/basic/os-util.c b/src/basic/os-util.c
index 3d199f028d..51c685bc6a 100644
--- a/src/basic/os-util.c
+++ b/src/basic/os-util.c
@@ -65,15 +65,15 @@ int open_extension_release(const char *root, const char *extension, char **ret_p
extension_full_path = strjoina("/usr/lib/extension-release.d/extension-release.", extension);
r = chase_symlinks(extension_full_path, root, CHASE_PREFIX_ROOT,
- ret_path ? &q : NULL,
- ret_fd ? &fd : NULL);
+ ret_path ? &q : NULL,
+ ret_fd ? &fd : NULL);
} else {
const char *p;
FOREACH_STRING(p, "/etc/os-release", "/usr/lib/os-release") {
r = chase_symlinks(p, root, CHASE_PREFIX_ROOT,
- ret_path ? &q : NULL,
- ret_fd ? &fd : NULL);
+ ret_path ? &q : NULL,
+ ret_fd ? &fd : NULL);
if (r != -ENOENT)
break;
}
@@ -116,10 +116,9 @@ int fopen_extension_release(const char *root, const char *extension, char **ret_
if (!f)
return -errno;
- *ret_file = f;
-
if (ret_path)
*ret_path = TAKE_PTR(p);
+ *ret_file = f;
return 0;
}