From fde8fb7466a890aa9c29dddc5f559934b5aa28eb Mon Sep 17 00:00:00 2001 From: Mike Yuan Date: Sat, 20 Apr 2024 07:16:24 +0800 Subject: [PATCH] shared/vpick: flatten errno check --- src/shared/vpick.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/shared/vpick.c b/src/shared/vpick.c index 0f90af0fd08..fe332189be5 100644 --- a/src/shared/vpick.c +++ b/src/shared/vpick.c @@ -292,13 +292,12 @@ static int make_choice( return log_oom_debug(); r = chaseat(toplevel_fd, p, CHASE_AT_RESOLVE_IN_ROOT, &object_path, &object_fd); - if (r < 0) { - if (r != -ENOENT) - return log_debug_errno(r, "Failed to open '%s': %m", prefix_roota(toplevel_path, p)); - + if (r == -ENOENT) { *ret = PICK_RESULT_NULL; return 0; } + if (r < 0) + return log_debug_errno(r, "Failed to open '%s': %m", prefix_roota(toplevel_path, p)); return pin_choice( toplevel_path, -- 2.47.3