aboutsummaryrefslogtreecommitdiff
path: root/gdb/block.h
diff options
context:
space:
mode:
authorPedro Alves <palves@redhat.com>2017-07-20 18:04:46 +0100
committerPedro Alves <palves@redhat.com>2017-07-20 18:04:46 +0100
commit42edd901a220d9d963d2121d7014b81d43c1ac66 (patch)
treea82da7afe0d71a60890287dfe5d1200b94b488b3 /gdb/block.h
parentcf3252992378872212eeaaca090fe3b1491bcd3f (diff)
downloadfsf-binutils-gdb-42edd901a220d9d963d2121d7014b81d43c1ac66.zip
fsf-binutils-gdb-42edd901a220d9d963d2121d7014b81d43c1ac66.tar.gz
fsf-binutils-gdb-42edd901a220d9d963d2121d7014b81d43c1ac66.tar.bz2
Eliminate block_iter_name_*
This patch gets rid of block_iter_name_* as being unnecessary. It's the same as calling block_iter_match_*, and passing strcmp_iw as comparison routine. (A later patch will get rid of those new explicit strcmp_iw calls.) gdb/ChangeLog: 2017-07-20 Pedro Alves <palves@redhat.com> * block.c (block_iter_name_step, block_iter_name_first) (block_iter_name_next): Delete. (block_lookup_symbol_primary): Adjust to use dict_iter_match_first/dict_iter_match_next. * block.h (block_iter_name_first, block_iter_name_next): Delete declarations. (ALL_BLOCK_SYMBOLS_WITH_NAME): Adjust to use dict_iter_match_first/dict_iter_match_next.
Diffstat (limited to 'gdb/block.h')
-rw-r--r--gdb/block.h24
1 files changed, 3 insertions, 21 deletions
diff --git a/gdb/block.h b/gdb/block.h
index eeb5ed4..1741e52 100644
--- a/gdb/block.h
+++ b/gdb/block.h
@@ -237,25 +237,6 @@ extern struct symbol *block_iterator_first (const struct block *block,
extern struct symbol *block_iterator_next (struct block_iterator *iterator);
/* Initialize ITERATOR to point at the first symbol in BLOCK whose
- SYMBOL_SEARCH_NAME is NAME (as tested using strcmp_iw), and return
- that first symbol, or NULL if there are no such symbols. */
-
-extern struct symbol *block_iter_name_first (const struct block *block,
- const char *name,
- struct block_iterator *iterator);
-
-/* Advance ITERATOR to point at the next symbol in BLOCK whose
- SYMBOL_SEARCH_NAME is NAME (as tested using strcmp_iw), or NULL if
- there are no more such symbols. Don't call this if you've
- previously received NULL from block_iterator_first or
- block_iterator_next on this iteration. And don't call it unless
- ITERATOR was created by a previous call to block_iter_name_first
- with the same NAME. */
-
-extern struct symbol *block_iter_name_next (const char *name,
- struct block_iterator *iterator);
-
-/* Initialize ITERATOR to point at the first symbol in BLOCK whose
SYMBOL_SEARCH_NAME is NAME, as tested using COMPARE (which must use
the same conventions as strcmp_iw and be compatible with any
block hashing function), and return that first symbol, or NULL
@@ -340,8 +321,9 @@ extern int block_find_non_opaque_type_preferred (struct symbol *sym,
must be a struct block_iterator. SYM points to the current symbol. */
#define ALL_BLOCK_SYMBOLS_WITH_NAME(block, name, iter, sym) \
- for ((sym) = block_iter_name_first ((block), (name), &(iter)); \
+ for ((sym) = block_iter_match_first ((block), (name), \
+ strcmp_iw, &(iter)); \
(sym) != NULL; \
- (sym) = block_iter_name_next ((name), &(iter)))
+ (sym) = block_iter_match_next ((name), strcmp_iw, &(iter)))
#endif /* BLOCK_H */