mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2024-12-21 04:42:53 +08:00
b02f78f928
Adds an utility function to make it shorter to write the common case of wrapping an xstrdup with a unique_xmalloc_ptr, and uses it throughout. Note: I tried to put this in common/common-utils.h near skip_spaces, etc. but that is included in common/common-defs.h before common/gdb_unique_ptr.h is included, so it would fail to compile because gdb::unique_xmalloc_ptr isn't defined at that point yet. I tried moving the gdb_unique_ptr.h inclusion before common-utils.h, but that doesn't work because gdb_unique_ptr.h depends on common-utils.h for xfree. gdb/ChangeLog: 2019-06-04 Pedro Alves <palves@redhat.com> * common/gdb_unique_ptr.h (make_unique_xstrdup): New. * ada-lang.c (catch_ada_completer): Use make_unique_xstrdup. * breakpoint.c (condition_completer): Likewise. * cli/cli-dump.c (scan_expression): Likewise. * common/filestuff.c (mkdir_recursive): Likewise. * common/gdb_tilde_expand.c (gdb_tilde_expand_up) * common/pathstuff.c (gdb_realpath, gdb_realpath_keepfile) (gdb_abspath): Likewise. * compile/compile-cplus-types.c (compile_cplus_instance::decl_name): Likewise. * completer.c (complete_explicit_location): (signal_completer, reg_or_group_completer_1): Likewise. * cp-support.c (cp_remove_params_if_any): Likewise. * fbsd-tdep.c (fbsd_core_vnode_path): Likewise. * guile/scm-safe-call.c (gdbscm_safe_eval_string): Likewise. * infcmd.c (strip_bg_char): Likewise. * linespec.c (copy_token_string): Likewise. * mi/mi-main.c (output_cores): Likewise. * psymtab.c (psymtab_search_name): * symfile.c (test_set_ext_lang_command): Likewise. * target.c (target_fileio_read_stralloc): Likewise. * tui/tui-regs.c (tui_reggroup_completer): Likewise. * value.c (complete_internalvar): Likewise. gdb/gdbserver/ChangeLog: 2019-06-04 Pedro Alves <palves@redhat.com> * server.c (captured_main): Use make_unique_xstrdup.
68 lines
1.8 KiB
C++
68 lines
1.8 KiB
C++
/* std::unique_ptr specializations for GDB.
|
|
|
|
Copyright (C) 2016-2019 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 COMMON_GDB_UNIQUE_PTR_H
|
|
#define COMMON_GDB_UNIQUE_PTR_H
|
|
|
|
#include <memory>
|
|
|
|
namespace gdb
|
|
{
|
|
/* Define gdb::unique_xmalloc_ptr, a std::unique_ptr that manages
|
|
xmalloc'ed memory. */
|
|
|
|
/* The deleter for std::unique_xmalloc_ptr. Uses xfree. */
|
|
template <typename T>
|
|
struct xfree_deleter
|
|
{
|
|
void operator() (T *ptr) const { xfree (ptr); }
|
|
};
|
|
|
|
/* Same, for arrays. */
|
|
template <typename T>
|
|
struct xfree_deleter<T[]>
|
|
{
|
|
void operator() (T *ptr) const { xfree (ptr); }
|
|
};
|
|
|
|
/* Import the standard unique_ptr to our namespace with a custom
|
|
deleter. */
|
|
|
|
template<typename T> using unique_xmalloc_ptr
|
|
= std::unique_ptr<T, xfree_deleter<T>>;
|
|
|
|
/* A no-op deleter. */
|
|
template<typename T>
|
|
struct noop_deleter
|
|
{
|
|
void operator() (T *ptr) const { }
|
|
};
|
|
|
|
} /* namespace gdb */
|
|
|
|
/* Dup STR and return a unique_xmalloc_ptr for the result. */
|
|
|
|
static inline gdb::unique_xmalloc_ptr<char>
|
|
make_unique_xstrdup (const char *str)
|
|
{
|
|
return gdb::unique_xmalloc_ptr<char> (xstrdup (str));
|
|
}
|
|
|
|
#endif /* COMMON_GDB_UNIQUE_PTR_H */
|