From ddbcedf5de138bc83d5d16554a3f44163dcaef7a Mon Sep 17 00:00:00 2001 From: Christian Biesinger Date: Tue, 6 Aug 2019 11:50:52 -0500 Subject: [PATCH] Replace int with enum block_enum where appropriate. For better readability and type safety. gdb/ChangeLog: 2019-08-06 Christian Biesinger * symtab.c (symbol_cache_lookup): Change int to enum block_enum. (error_in_psymtab_expansion): Likewise. (lookup_symbol_via_quick_fns): Likewise. (basic_lookup_transparent_type_quick): Likewise. (basic_lookup_transparent_type_1): Likewise. --- gdb/ChangeLog | 8 ++++++++ gdb/symtab.c | 15 +++++++++------ 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 9bcd47d389b..4e6cc21bfea 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,11 @@ +2019-08-06 Christian Biesinger + + * symtab.c (symbol_cache_lookup): Change int to enum block_enum. + (error_in_psymtab_expansion): Likewise. + (lookup_symbol_via_quick_fns): Likewise. + (basic_lookup_transparent_type_quick): Likewise. + (basic_lookup_transparent_type_1): Likewise. + 2019-08-06 Tom Tromey * source.c (last_source_error): Now bool. diff --git a/gdb/symtab.c b/gdb/symtab.c index 95008a5bd26..347e58ccf33 100644 --- a/gdb/symtab.c +++ b/gdb/symtab.c @@ -1303,7 +1303,7 @@ set_symbol_cache_size_handler (const char *args, int from_tty, static struct block_symbol symbol_cache_lookup (struct symbol_cache *cache, - struct objfile *objfile_context, int block, + struct objfile *objfile_context, enum block_enum block, const char *name, domain_enum domain, struct block_symbol_cache **bsc_ptr, struct symbol_cache_slot **slot_ptr) @@ -2338,7 +2338,7 @@ lookup_symbol_in_objfile_from_linkage_name (struct objfile *objfile, in a psymtab but not in a symtab. */ static void ATTRIBUTE_NORETURN -error_in_psymtab_expansion (int block_index, const char *name, +error_in_psymtab_expansion (enum block_enum block_index, const char *name, struct compunit_symtab *cust) { error (_("\ @@ -2355,8 +2355,9 @@ Internal: %s symbol `%s' found in %s psymtab but not in symtab.\n\ the "quick" symbol table functions. */ static struct block_symbol -lookup_symbol_via_quick_fns (struct objfile *objfile, int block_index, - const char *name, const domain_enum domain) +lookup_symbol_via_quick_fns (struct objfile *objfile, + enum block_enum block_index, const char *name, + const domain_enum domain) { struct compunit_symtab *cust; const struct blockvector *bv; @@ -2725,7 +2726,8 @@ lookup_transparent_type (const char *name) "quick" symbol table functions. */ static struct type * -basic_lookup_transparent_type_quick (struct objfile *objfile, int block_index, +basic_lookup_transparent_type_quick (struct objfile *objfile, + enum block_enum block_index, const char *name) { struct compunit_symtab *cust; @@ -2755,7 +2757,8 @@ basic_lookup_transparent_type_quick (struct objfile *objfile, int block_index, BLOCK_INDEX is either GLOBAL_BLOCK or STATIC_BLOCK. */ static struct type * -basic_lookup_transparent_type_1 (struct objfile *objfile, int block_index, +basic_lookup_transparent_type_1 (struct objfile *objfile, + enum block_enum block_index, const char *name) { const struct blockvector *bv; -- 2.30.2