From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 103464 invoked by alias); 21 Nov 2019 22:36:19 -0000 Mailing-List: contact gdb-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Archive: List-Post: List-Help: , Sender: gdb-cvs-owner@sourceware.org List-Subscribe: Sender: gdb-cvs-owner@sourceware.org Received: (qmail 103436 invoked by uid 10256); 21 Nov 2019 22:36:19 -0000 Date: Thu, 21 Nov 2019 22:36:00 -0000 Message-ID: <20191121223619.103435.qmail@sourceware.org> Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Christian Biesinger To: gdb-cvs@sourceware.org Subject: [binutils-gdb] Rename demangle.c to gdb-demangle.c, and some cleanup X-Act-Checkin: binutils-gdb X-Git-Author: Christian Biesinger X-Git-Refname: refs/heads/master X-Git-Oldrev: 6ba185213659517b4299a3e4c92813839f19f045 X-Git-Newrev: f10ffa4146416f1fb11ae1bc1a1c423d49e2dbf0 X-SW-Source: 2019-11/txt/msg00064.txt.bz2 https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=f10ffa4146416f1fb11ae1bc1a1c423d49e2dbf0 commit f10ffa4146416f1fb11ae1bc1a1c423d49e2dbf0 Author: Christian Biesinger Date: Thu Nov 21 13:02:07 2019 -0600 Rename demangle.c to gdb-demangle.c, and some cleanup In addition to renaming demangle.c to match the header file naming, this also makes is_cplus_marker return a bool and removes a duplicate declaration of "bool demangle" from symtab.h. gdb/ChangeLog: 2019-11-21 Christian Biesinger * Makefile.in: Update. * demangle.c: Rename to... * gdb-demangle.c: ..this. (is_cplus_marker): Change return type to bool. (_initialize_demangler): Rename to... (_initialize_gdb_demangle): ...this. * gdb-demangle.h (is_cplus_marker): Change return type to bool. * symtab.h (demangle): Remove declaration; instead include gdb-demangle.h. Change-Id: I83c3b3f7ee71b2bf6f5b5d0f9eb1d4b5208f2a97 Diff: --- gdb/ChangeLog | 12 ++++++++++++ gdb/Makefile.in | 2 +- gdb/{demangle.c => gdb-demangle.c} | 4 ++-- gdb/gdb-demangle.h | 2 +- gdb/symtab.h | 2 +- 5 files changed, 17 insertions(+), 5 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 0c81de4..81c6690 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,15 @@ +2019-11-21 Christian Biesinger + + * Makefile.in: Update. + * demangle.c: Rename to... + * gdb-demangle.c: ..this. + (is_cplus_marker): Change return type to bool. + (_initialize_demangler): Rename to... + (_initialize_gdb_demangle): ...this. + * gdb-demangle.h (is_cplus_marker): Change return type to bool. + * symtab.h (demangle): Remove declaration; instead include + gdb-demangle.h. + 2019-11-21 Tom Tromey * gdbsupport/format.c (format_pieces): Parse %I64d. diff --git a/gdb/Makefile.in b/gdb/Makefile.in index 5a4ffd5..600ebab 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -1009,7 +1009,6 @@ COMMON_SFILES = \ dbxread.c \ dcache.c \ debug.c \ - demangle.c \ dictionary.c \ disasm.c \ disasm-selftests.c \ @@ -1040,6 +1039,7 @@ COMMON_SFILES = \ frame-base.c \ frame-unwind.c \ gcore.c \ + gdb-demangle.c \ gdb_bfd.c \ gdb_obstack.c \ gdb_regex.c \ diff --git a/gdb/demangle.c b/gdb/gdb-demangle.c similarity index 99% rename from gdb/demangle.c rename to gdb/gdb-demangle.c index d8b0310..2ed64d4 100644 --- a/gdb/demangle.c +++ b/gdb/gdb-demangle.c @@ -149,7 +149,7 @@ static char cplus_markers[] = {'$', '.', '\0'}; /* See documentation in gdb-demangle.h. */ -int +bool is_cplus_marker (int c) { return c && strchr (cplus_markers, c) != NULL; @@ -213,7 +213,7 @@ demangle_command (const char *args, int from_tty) } void -_initialize_demangler (void) +_initialize_gdb_demangle (void) { int i, ndems; diff --git a/gdb/gdb-demangle.h b/gdb/gdb-demangle.h index 327a633..e68973f 100644 --- a/gdb/gdb-demangle.h +++ b/gdb/gdb-demangle.h @@ -29,6 +29,6 @@ extern bool demangle; extern bool asm_demangle; /* Check if a character is one of the commonly used C++ marker characters. */ -extern int is_cplus_marker (int); +extern bool is_cplus_marker (int); #endif /* GDB_DEMANGLE_H */ diff --git a/gdb/symtab.h b/gdb/symtab.h index 1e82182..8f95a3a 100644 --- a/gdb/symtab.h +++ b/gdb/symtab.h @@ -33,6 +33,7 @@ #include "gdbsupport/gdb_string_view.h" #include "gdbsupport/next-iterator.h" #include "completer.h" +#include "gdb-demangle.h" /* Opaque declarations. */ struct ui_file; @@ -553,7 +554,6 @@ extern const char *symbol_demangled_name #define SYMBOL_PRINT_NAME(symbol) \ (demangle ? SYMBOL_NATURAL_NAME (symbol) : SYMBOL_LINKAGE_NAME (symbol)) -extern bool demangle; /* Macro that returns the name to be used when sorting and searching symbols. In C++, we search for the demangled form of a name,