luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-26 05:56:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

gstdio: Preserve errno when calling g_clear_fd() from g_autofd

Browse Source 
g_clear_fd() can alter errno, but it's unexpected for leaving a scope
to change errno.

Signed-off-by: Simon McVittie <smcv@collabora.com>
This commit is contained in:
Simon McVittie 2022-10-28 14:53:07 +01:00
parent e2e55a13d1
commit 088d8b4359
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
glib/gstdio.h
View File

@ -23,6 +23,7 @@
#include <glib/gprintf.h> #include <glib/gprintf.h>
#include <errno.h>
#include <sys/stat.h> #include <sys/stat.h>
G_BEGIN_DECLS G_BEGIN_DECLS
@ -199,19 +200,28 @@ g_clear_fd (int *fd_ptr,
/* g_autofd should be defined on the same compilers where g_autofree is /* g_autofd should be defined on the same compilers where g_autofree is
* This avoids duplicating the feature-detection here. */ * This avoids duplicating the feature-detection here. */
#ifdef g_autofree #ifdef g_autofree
#ifndef __GTK_DOC_IGNORE__
/* Not public API */ /* Not public API */
static inline void static inline void
_g_clear_fd_ignore_error (int *fd_ptr) _g_clear_fd_ignore_error (int *fd_ptr)
{ {
/* Don't overwrite thread-local errno if closing the fd fails */
int errsv = errno;
/* Suppress "Not available before" warning */ /* Suppress "Not available before" warning */
G_GNUC_BEGIN_IGNORE_DEPRECATIONS G_GNUC_BEGIN_IGNORE_DEPRECATIONS
if (!g_clear_fd (fd_ptr, NULL)) if (!g_clear_fd (fd_ptr, NULL))
{ {
/* Do nothing: we ignore all errors, except for EBADF which /* Do nothing: we ignore all errors, except for EBADF which
* is a programming error, checked for by g_close(). */ * is a programming error, checked for by g_close(). */
} }
G_GNUC_END_IGNORE_DEPRECATIONS G_GNUC_END_IGNORE_DEPRECATIONS
errno = errsv;
} }
#endif
#define g_autofd _GLIB_CLEANUP(_g_clear_fd_ignore_error) GLIB_AVAILABLE_MACRO_IN_2_76 #define g_autofd _GLIB_CLEANUP(_g_clear_fd_ignore_error) GLIB_AVAILABLE_MACRO_IN_2_76
#endif #endif