From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 16578 invoked by alias); 19 Jan 2012 15:40:46 -0000 Received: (qmail 16457 invoked by uid 22791); 19 Jan 2012 15:40:44 -0000 X-SWARE-Spam-Status: No, hits=-1.2 required=5.0 tests=AWL,BAYES_00,KAM_STOCKGEN,TW_BJ X-Spam-Check-By: sourceware.org Received: from rock.gnat.com (HELO rock.gnat.com) (205.232.38.15) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Thu, 19 Jan 2012 15:40:30 +0000 Received: from localhost (localhost.localdomain [127.0.0.1]) by filtered-rock.gnat.com (Postfix) with ESMTP id 2F5672BAE83 for ; Thu, 19 Jan 2012 10:40:30 -0500 (EST) Received: from rock.gnat.com ([127.0.0.1]) by localhost (rock.gnat.com [127.0.0.1]) (amavisd-new, port 10024) with LMTP id fKBjGwPI2YiS for ; Thu, 19 Jan 2012 10:40:30 -0500 (EST) Received: from joel.gnat.com (localhost.localdomain [127.0.0.1]) by rock.gnat.com (Postfix) with ESMTP id 57BC12BAC90 for ; Thu, 19 Jan 2012 10:40:29 -0500 (EST) Received: by joel.gnat.com (Postfix, from userid 1000) id AE7DF145615; Thu, 19 Jan 2012 19:40:19 +0400 (RET) Date: Thu, 19 Jan 2012 15:47:00 -0000 From: Joel Brobecker To: gdb-patches@sourceware.org Subject: Re: [RFA 3/3] Remove language param from name_matcher in struct quick_symbol_functions Message-ID: <20120119154019.GH31383@adacore.com> References: <20111221140128.GK23376@adacore.com> <1324636693-24034-4-git-send-email-brobecker@adacore.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1324636693-24034-4-git-send-email-brobecker@adacore.com> User-Agent: Mutt/1.5.20 (2009-06-14) Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org X-SW-Source: 2012-01/txt/msg00700.txt.bz2 > And lastly, a little cleanup. > > The quick_symbol_functions struct contains a field which is pointer > a function which takes another function, called name_matcher, as > its parameter. This name_matcher currently has 3 arguments, one > of them being the language. This parameter is no longer used, and > thus deleted. > > gdb/ChangeLog: > > * symfile.h (struct quick_symbol_functions) [expand_symtabs_matching]: > Remove language parameter from name_matcher. Adjust the comment. > * symtab.c (search_symbols_name_matches, expand_partial_symbol_name): > Remove language parameter. > * ada-lang.c (ada_expand_partial_symbol_name): Likewise. > * linespec.c (iterate_name_matcher): Likewise. > * dwarf2read.c (dw2_expand_symtabs_matching): Adjust type of > name_matcher. Adjust call accordingly. > * psymtab.c (expand_symtabs_matching_via_partial): Likewise. > (maintenance_check_symtabs): Adjust type of parameter "fun". > * psymtab.h (maintenance_check_symtabs): Likewise. Ping... (this one should be fairly straightforward if the patch #2 of the series is accepted). Thanks! -- Joel --- gdb/ada-lang.c | 3 +-- gdb/dwarf2read.c | 4 ++-- gdb/linespec.c | 3 +-- gdb/psymtab.c | 8 +++----- gdb/psymtab.h | 3 +-- gdb/symfile.h | 6 +++--- gdb/symtab.c | 6 ++---- 7 files changed, 13 insertions(+), 20 deletions(-) diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c index d871193..d6404c5 100644 --- a/gdb/ada-lang.c +++ b/gdb/ada-lang.c @@ -5701,8 +5701,7 @@ struct add_partial_datum /* A callback for expand_partial_symbol_names. */ static int -ada_expand_partial_symbol_name (const struct language_defn *language, - const char *name, void *user_data) +ada_expand_partial_symbol_name (const char *name, void *user_data) { struct add_partial_datum *data = user_data; diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c index 7905052..a4ca584 100644 --- a/gdb/dwarf2read.c +++ b/gdb/dwarf2read.c @@ -2759,7 +2759,7 @@ static void dw2_expand_symtabs_matching (struct objfile *objfile, int (*file_matcher) (const char *, void *), - int (*name_matcher) (const struct language_defn *, const char *, void *), + int (*name_matcher) (const char *, void *), enum search_domain kind, void *data) { @@ -2813,7 +2813,7 @@ dw2_expand_symtabs_matching name = index->constant_pool + MAYBE_SWAP (index->symbol_table[idx]); - if (! (*name_matcher) (current_language, name, data)) + if (! (*name_matcher) (name, data)) continue; /* The name was matched, now expand corresponding CUs that were diff --git a/gdb/linespec.c b/gdb/linespec.c index 6f463a4..eefd5d4 100644 --- a/gdb/linespec.c +++ b/gdb/linespec.c @@ -338,8 +338,7 @@ struct symbol_matcher_data callback to the expand_symtabs_matching method. */ static int -iterate_name_matcher (const struct language_defn *language, - const char *name, void *d) +iterate_name_matcher (const char *name, void *d) { const struct symbol_matcher_data *data = d; diff --git a/gdb/psymtab.c b/gdb/psymtab.c index 861b302..1ba7436 100644 --- a/gdb/psymtab.c +++ b/gdb/psymtab.c @@ -1252,7 +1252,7 @@ static void expand_symtabs_matching_via_partial (struct objfile *objfile, int (*file_matcher) (const char *, void *), - int (*name_matcher) (const struct language_defn *, const char *, void *), + int (*name_matcher) (const char *, void *), enum search_domain kind, void *data) { @@ -1304,8 +1304,7 @@ expand_symtabs_matching_via_partial && SYMBOL_CLASS (*psym) == LOC_BLOCK) || (kind == TYPES_DOMAIN && SYMBOL_CLASS (*psym) == LOC_TYPEDEF)) - && (*name_matcher) (current_language, - SYMBOL_SEARCH_NAME (*psym), data)) + && (*name_matcher) (SYMBOL_SEARCH_NAME (*psym), data)) { PSYMTAB_TO_SYMTAB (ps); keep_going = 0; @@ -1945,8 +1944,7 @@ maintenance_check_symtabs (char *ignore, int from_tty) void -expand_partial_symbol_names (int (*fun) (const struct language_defn *, - const char *, void *), +expand_partial_symbol_names (int (*fun) (const char *, void *), void *data) { struct objfile *objfile; diff --git a/gdb/psymtab.h b/gdb/psymtab.h index 940b537..de292c5 100644 --- a/gdb/psymtab.h +++ b/gdb/psymtab.h @@ -30,8 +30,7 @@ extern struct psymbol_bcache *psymbol_bcache_init (void); extern void psymbol_bcache_free (struct psymbol_bcache *); extern struct bcache *psymbol_bcache_get_bcache (struct psymbol_bcache *); -void expand_partial_symbol_names (int (*fun) (const struct language_defn *, - const char *, void *), +void expand_partial_symbol_names (int (*fun) (const char *, void *), void *data); void map_partial_symbol_filenames (symbol_filename_ftype *fun, void *data, diff --git a/gdb/symfile.h b/gdb/symfile.h index ef1ca24..77dddea 100644 --- a/gdb/symfile.h +++ b/gdb/symfile.h @@ -262,8 +262,8 @@ struct quick_symbol_functions Otherwise, if KIND does not match this symbol is skipped. If even KIND matches, then NAME_MATCHER is called for each symbol - defined in the file. The current language, the symbol "search" - name and DATA are passed to NAME_MATCHER. + defined in the file. The symbol "search" name and DATA are passed + to NAME_MATCHER. If NAME_MATCHER returns zero, then this symbol is skipped. @@ -274,7 +274,7 @@ struct quick_symbol_functions void (*expand_symtabs_matching) (struct objfile *objfile, int (*file_matcher) (const char *, void *), - int (*name_matcher) (const struct language_defn *, const char *, void *), + int (*name_matcher) (const char *, void *), enum search_domain kind, void *data); diff --git a/gdb/symtab.c b/gdb/symtab.c index 1ea4253..cf94c9c 100644 --- a/gdb/symtab.c +++ b/gdb/symtab.c @@ -3166,8 +3166,7 @@ search_symbols_file_matches (const char *filename, void *user_data) /* A callback for expand_symtabs_matching. */ static int -search_symbols_name_matches (const struct language_defn *language, - const char *symname, void *user_data) +search_symbols_name_matches (const char *symname, void *user_data) { struct search_symbols_data *data = user_data; @@ -3975,8 +3974,7 @@ add_macro_name (const char *name, const struct macro_definition *ignore, /* A callback for expand_partial_symbol_names. */ static int -expand_partial_symbol_name (const struct language_defn *language, - const char *name, void *user_data) +expand_partial_symbol_name (const char *name, void *user_data) { struct add_name_data *datum = (struct add_name_data *) user_data; -- 1.7.1 -- Joel