diff options
| author | Simon Marchi <simon.marchi@polymtl.ca> | 2021-07-22 11:34:57 -0400 |
|---|---|---|
| committer | Simon Marchi <simon.marchi@polymtl.ca> | 2021-09-30 15:21:48 -0400 |
| commit | e6e51c9c4b402cd46595790b26087ebf2fead8c1 (patch) | |
| tree | d4785bbbf171620d9dd4b881bec2f19def625263 /gdbsupport/filestuff.h | |
| parent | 5109a7bd9b87bdad530f2ebf97036e6087b4504d (diff) | |
| download | binutils-gdb-e6e51c9c4b402cd46595790b26087ebf2fead8c1.tar.gz | |
gdbsupport: move gdb_file_up to its own file
The following patches wants to change gdb_fopen_cloexec and
gdb_mkostemp_cloexec to return a scoped_fd. Doing this causes a cyclic
include between scoped_fd.h and filestuff.h, that both want to include
each other. scoped_fd.h includes filestuff.h because of the
scoped_fd::to_file method's return value. filestuff.h would then
include scoped_fd.h for gdb_fopen_cloexec's and gdb_mkostemp_cloexec's
return values.
To fix that, move gdb_file_up to its own file, gdb_file.h.
Change-Id: Ic82a48914b2aacee8f14af535b7469245f88b93d
Diffstat (limited to 'gdbsupport/filestuff.h')
| -rw-r--r-- | gdbsupport/filestuff.h | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/gdbsupport/filestuff.h b/gdbsupport/filestuff.h index 7f4cfb2388b..aa15f89aa92 100644 --- a/gdbsupport/filestuff.h +++ b/gdbsupport/filestuff.h @@ -21,6 +21,7 @@ #include <dirent.h> #include <fcntl.h> +#include "gdb_file.h" /* Note all the file descriptors which are open when this is called. These file descriptors will not be closed by close_most_fds. */ @@ -69,18 +70,6 @@ gdb_open_cloexec (const std::string &filename, int flags, return gdb_open_cloexec (filename.c_str (), flags, mode); } -struct gdb_file_deleter -{ - void operator() (FILE *file) const - { - fclose (file); - } -}; - -/* A unique pointer to a FILE. */ - -typedef std::unique_ptr<FILE, gdb_file_deleter> gdb_file_up; - /* Like 'fopen', but ensures that the returned file descriptor has the close-on-exec flag set. */ |