From 82775307c5caf93e70671d9cc978821784d4f2d0 Mon Sep 17 00:00:00 2001 From: Mike Yuan Date: Mon, 26 May 2025 19:24:10 +0200 Subject: [PATCH] fd-util: group close_fd_ptr() with fd funcs, not FILE/DIR stream ones --- src/basic/fd-util.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) 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); -- 2.47.3