From f461a28da70320473c7466bcdc34fa601da0877b Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Tue, 21 Mar 2023 21:17:22 +0100 Subject: chase-symlinks: Rename chase_symlinks() to chase() Chasing symlinks is a core function that's used in a lot of places so it deservers a less verbose names so let's rename it to chase() and chaseat(). We also slightly change the pattern used for the chaseat() helpers so we get chase_and_openat() and similar. --- src/sysusers/sysusers.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/sysusers') diff --git a/src/sysusers/sysusers.c b/src/sysusers/sysusers.c index 70abcfa131..f9f694bd54 100644 --- a/src/sysusers/sysusers.c +++ b/src/sysusers/sysusers.c @@ -5,7 +5,7 @@ #include "alloc-util.h" #include "build.h" -#include "chase-symlinks.h" +#include "chase.h" #include "conf-files.h" #include "constants.h" #include "copy.h" @@ -1571,7 +1571,7 @@ static int item_equivalent(Item *a, Item *b) { !(is_nologin_shell(a_shell) && is_nologin_shell(b_shell))) { _cleanup_free_ char *pa = NULL, *pb = NULL; - r = chase_symlinks(a_shell, arg_root, CHASE_PREFIX_ROOT | CHASE_NONEXISTENT, &pa, NULL); + r = chase(a_shell, arg_root, CHASE_PREFIX_ROOT | CHASE_NONEXISTENT, &pa, NULL); if (r < 0) { log_full_errno(ERRNO_IS_RESOURCE(r) ? LOG_ERR : LOG_DEBUG, r, "Failed to look up path '%s%s%s': %m", @@ -1579,7 +1579,7 @@ static int item_equivalent(Item *a, Item *b) { return ERRNO_IS_RESOURCE(r) ? r : false; } - r = chase_symlinks(b_shell, arg_root, CHASE_PREFIX_ROOT | CHASE_NONEXISTENT, &pb, NULL); + r = chase(b_shell, arg_root, CHASE_PREFIX_ROOT | CHASE_NONEXISTENT, &pb, NULL); if (r < 0) { log_full_errno(ERRNO_IS_RESOURCE(r) ? LOG_ERR : LOG_DEBUG, r, "Failed to look up path '%s%s%s': %m", -- cgit v1.2.1