From e6e51c9c4b402cd46595790b26087ebf2fead8c1 Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Thu, 22 Jul 2021 11:34:57 -0400 Subject: 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 --- gdbsupport/gdb_file.h | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 gdbsupport/gdb_file.h (limited to 'gdbsupport/gdb_file.h') 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 . */ + +#ifndef GDBSUPPORT_GDB_FILE +#define GDBSUPPORT_GDB_FILE + +#include +#include + +struct gdb_file_deleter +{ + void operator() (FILE *file) const + { + fclose (file); + } +}; + +/* A unique pointer to a FILE. */ + +typedef std::unique_ptr gdb_file_up; + +#endif -- cgit v1.2.1