]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
chase: do not wrap xopenat() with RET_NERRNO()
authorYu Watanabe <watanabe.yu+github@gmail.com>
Thu, 15 Feb 2024 11:02:51 +0000 (20:02 +0900)
committerYu Watanabe <watanabe.yu+github@gmail.com>
Thu, 15 Feb 2024 15:25:37 +0000 (00:25 +0900)
Follow-up for 47f0e1b5e04c27572b540ae4a86e522d268ffd3c.

src/basic/chase.c

index b0592c538dd9b440d529dbc6074442fb17262cfa..26bc2d69a95f7ecbcedf074bf2e7386c21c8da17 100644 (file)
@@ -760,10 +760,10 @@ int chase_and_open(const char *path, const char *root, ChaseFlags chase_flags, i
         if (empty_or_root(root) && !ret_path &&
             (chase_flags & (CHASE_NO_AUTOFS|CHASE_SAFE|CHASE_PROHIBIT_SYMLINKS|CHASE_PARENT|CHASE_MKDIR_0755)) == 0)
                 /* Shortcut this call if none of the special features of this call are requested */
-                return RET_NERRNO(xopenat(AT_FDCWD, path,
-                                          open_flags | (FLAGS_SET(chase_flags, CHASE_NOFOLLOW) ? O_NOFOLLOW : 0),
-                                          /* xopen_flags = */ 0,
-                                          mode));
+                return xopenat(AT_FDCWD, path,
+                               open_flags | (FLAGS_SET(chase_flags, CHASE_NOFOLLOW) ? O_NOFOLLOW : 0),
+                               /* xopen_flags = */ 0,
+                               mode);
 
         r = chase(path, root, CHASE_PARENT|chase_flags, &p, &path_fd);
         if (r < 0)
@@ -964,10 +964,10 @@ int chase_and_openat(int dir_fd, const char *path, ChaseFlags chase_flags, int o
         if (dir_fd == AT_FDCWD && !ret_path &&
             (chase_flags & (CHASE_NO_AUTOFS|CHASE_SAFE|CHASE_PROHIBIT_SYMLINKS|CHASE_PARENT|CHASE_MKDIR_0755)) == 0)
                 /* Shortcut this call if none of the special features of this call are requested */
-                return RET_NERRNO(xopenat(dir_fd, path,
-                                          open_flags | (FLAGS_SET(chase_flags, CHASE_NOFOLLOW) ? O_NOFOLLOW : 0),
-                                          /* xopen_flags = */ 0,
-                                          mode));
+                return xopenat(dir_fd, path,
+                               open_flags | (FLAGS_SET(chase_flags, CHASE_NOFOLLOW) ? O_NOFOLLOW : 0),
+                               /* xopen_flags = */ 0,
+                               mode);
 
         r = chaseat(dir_fd, path, chase_flags|CHASE_PARENT, &p, &path_fd);
         if (r < 0)