From 5a7e677294c92c04ea8c7c09a2b1abd2988f03df Mon Sep 17 00:00:00 2001 From: Sebastian Wick Date: Fri, 6 Feb 2026 16:32:50 +0100 Subject: [PATCH] flatpak-bwrap: Use glnx_close_fd as clear func We already have a function which clears a fd that a pointer points to, so let's use it instead of duplicating the code. Will become useful in a later commit as well. --- common/flatpak-bwrap.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/common/flatpak-bwrap.c b/common/flatpak-bwrap.c index a3d29782..a0eddfd4 100644 --- a/common/flatpak-bwrap.c +++ b/common/flatpak-bwrap.c @@ -42,15 +42,6 @@ #include "flatpak-utils-private.h" #include "flatpak-utils-base-private.h" -static void -clear_fd (gpointer data) -{ - int *fd_p = data; - - if (fd_p != NULL && *fd_p != -1) - close (*fd_p); -} - char *flatpak_bwrap_empty_env[] = { NULL }; FlatpakBwrap * @@ -60,9 +51,9 @@ flatpak_bwrap_new (char **env) bwrap->argv = g_ptr_array_new_with_free_func (g_free); bwrap->noinherit_fds = g_array_new (FALSE, TRUE, sizeof (int)); - g_array_set_clear_func (bwrap->noinherit_fds, clear_fd); + g_array_set_clear_func (bwrap->noinherit_fds, (GDestroyNotify) glnx_close_fd); bwrap->fds = g_array_new (FALSE, TRUE, sizeof (int)); - g_array_set_clear_func (bwrap->fds, clear_fd); + g_array_set_clear_func (bwrap->fds, (GDestroyNotify) glnx_close_fd); if (env) bwrap->envp = g_strdupv (env);