From: Mike Yuan <me@yhndnzj.com>
Date: Mon, 20 May 2024 11:17:22 +0000 (+0800)
Subject: fs-util: use RET_GATHER at one more place
X-Git-Tag: v257-rc1~1193^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=69baf0cb911e8300cf53dd5e4227fa43f95de740;p=thirdparty%2Fsystemd.git

fs-util: use RET_GATHER at one more place
---

diff --git a/src/basic/fs-util.c b/src/basic/fs-util.c
index 5632736eedf..6bb4587f817 100644
--- a/src/basic/fs-util.c
+++ b/src/basic/fs-util.c
@@ -633,11 +633,11 @@ static int tmp_dir_internal(const char *def, const char **ret) {
                 return 0;
         }
 
-        k = is_dir(def, true);
+        k = is_dir(def, /* follow = */ true);
         if (k == 0)
                 k = -ENOTDIR;
         if (k < 0)
-                return r < 0 ? r : k;
+                return RET_GATHER(r, k);
 
         *ret = def;
         return 0;