From: Zbigniew Jędrzejewski-Szmek Date: Sun, 7 Mar 2021 11:15:42 +0000 (+0100) Subject: basic/os-util: adjust indentation X-Git-Tag: v248-rc3~35^2~2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9e8a392a9ac1828b246550ec3056759b703fee6f;p=thirdparty%2Fsystemd.git basic/os-util: adjust indentation --- diff --git a/src/basic/os-util.c b/src/basic/os-util.c index 3d199f028d6..51c685bc6a8 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; }