From: Mike Yuan <me@yhndnzj.com>
Date: Mon, 26 May 2025 17:24:10 +0000 (+0200)
Subject: fd-util: group close_fd_ptr() with fd funcs, not FILE/DIR stream ones
X-Git-Tag: v258-rc1~477^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=82775307c5caf93e70671d9cc978821784d4f2d0;p=thirdparty%2Fsystemd.git

fd-util: group close_fd_ptr() with fd funcs, not FILE/DIR stream ones
---

diff --git a/src/basic/fd-util.h b/src/basic/fd-util.h
index 6e2b709657b..3bb8152a7cf 100644
--- a/src/basic/fd-util.h
+++ b/src/basic/fd-util.h
@@ -29,6 +29,11 @@ static inline int safe_close_above_stdio(int fd) {
         return safe_close(fd);
 }
 
+static inline void* close_fd_ptr(void *p) {
+        safe_close(PTR_TO_FD(p));
+        return NULL;
+}
+
 void close_many(const int fds[], size_t n_fds);
 void close_many_unset(int fds[], size_t n_fds);
 void close_many_and_free(int *fds, size_t n_fds);
@@ -36,10 +41,6 @@ void close_many_and_free(int *fds, size_t n_fds);
 int fclose_nointr(FILE *f);
 FILE* safe_fclose(FILE *f);
 DIR* safe_closedir(DIR *f);
-static inline void* close_fd_ptr(void *p) {
-        safe_close(PTR_TO_FD(p));
-        return NULL;
-}
 
 static inline void closep(int *fd) {
         safe_close(*fd);