diff options
| -rw-r--r-- | gdbsupport/filestuff.h | 13 | ||||
| -rw-r--r-- | gdbsupport/gdb_file.h | 37 | ||||
| -rw-r--r-- | gdbsupport/scoped_fd.h | 2 |
3 files changed, 39 insertions, 13 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. */ diff --git a/gdbsupport/gdb_file.h b/gdbsupport/gdb_file.h new file mode 100644 index 00000000000..2f5b399f6e8 --- /dev/null +++ b/gdbsupport/gdb_file.h @@ -0,0 +1,37 @@ +/* gdb_file_up, an RAII wrapper around FILE. + Copyright (C) 2021 Free Software Foundation, Inc. + + This file is part of GDB. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. */ + +#ifndef GDBSUPPORT_GDB_FILE +#define GDBSUPPORT_GDB_FILE + +#include <memory> +#include <stdio.h> + +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; + +#endif diff --git a/gdbsupport/scoped_fd.h b/gdbsupport/scoped_fd.h index a1aad849399..f16e811a2ce 100644 --- a/gdbsupport/scoped_fd.h +++ b/gdbsupport/scoped_fd.h @@ -21,7 +21,7 @@ #define COMMON_SCOPED_FD_H #include <unistd.h> -#include "filestuff.h" +#include "gdb_file.h" /* A smart-pointer-like class to automatically close a file descriptor. */ |