From c1fb98360cf47485a5f943b657fe8d56244da7e7 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Thu, 17 Sep 2020 11:47:50 -0600 Subject: [PATCH] Use htab_up in breakpoint.c This changes breakpoint.c to use htab_up rather than an explicit htab_delete. This simplifies the code somewhat. gdb/ChangeLog 2020-09-17 Tom Tromey * breakpoint.c (ambiguous_names_p): Use htab_up. --- gdb/ChangeLog | 4 ++++ gdb/breakpoint.c | 12 ++++-------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index e9b7b7d5960..cd0a18029ec 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,7 @@ +2020-09-17 Tom Tromey + + * breakpoint.c (ambiguous_names_p): Use htab_up. + 2020-09-17 Tom Tromey * auto-load.c (struct auto_load_pspace_info) diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index 1876af955b4..e0712b2ea9d 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -13246,8 +13246,8 @@ static int ambiguous_names_p (struct bp_location *loc) { struct bp_location *l; - htab_t htab = htab_create_alloc (13, htab_hash_string, streq_hash, NULL, - xcalloc, xfree); + htab_up htab (htab_create_alloc (13, htab_hash_string, streq_hash, NULL, + xcalloc, xfree)); for (l = loc; l != NULL; l = l->next) { @@ -13258,19 +13258,15 @@ ambiguous_names_p (struct bp_location *loc) if (name == NULL) continue; - slot = (const char **) htab_find_slot (htab, (const void *) name, + slot = (const char **) htab_find_slot (htab.get (), (const void *) name, INSERT); /* NOTE: We can assume slot != NULL here because xcalloc never returns NULL. */ if (*slot != NULL) - { - htab_delete (htab); - return 1; - } + return 1; *slot = name; } - htab_delete (htab); return 0; } -- 2.30.2