aboutsummaryrefslogtreecommitdiff
path: root/gdb/completer.c
diff options
context:
space:
mode:
authorTom Tromey <tom@tromey.com>2018-04-01 09:33:13 -0600
committerTom Tromey <tom@tromey.com>2018-04-05 07:39:36 -0600
commit459a2e4ccf9aadfba9819facba1c9be5297c1625 (patch)
tree2209376112b15dd814aa718a0d3b1247fecc7fe9 /gdb/completer.c
parent9be2c17a900178df75a2208fd112ceb4325a70c1 (diff)
downloadgdb-459a2e4ccf9aadfba9819facba1c9be5297c1625.zip
gdb-459a2e4ccf9aadfba9819facba1c9be5297c1625.tar.gz
gdb-459a2e4ccf9aadfba9819facba1c9be5297c1625.tar.bz2
Change streq to return bool
I wanted to use streq with std::unique in another (upcoming) patch in this seres, so I changed it to return bool. To my surprise, this lead to regressions. The cause turned out to be that streq was used as an htab callback -- by casting it to the correct function type. This sort of cast is invalid, so this patch adds a variant which is directly suitable for use by htab. (Note that I did not add an overload, as I could not get that to work with template deduction in the other patch.) ChangeLog 2018-04-05 Tom Tromey <tom@tromey.com> * completer.c (completion_tracker::completion_tracker): Remove cast. (completion_tracker::discard_completions): Likewise. * breakpoint.c (ambiguous_names_p): Remove cast. * ada-lang.c (_initialize_ada_language): Remove cast. * utils.h (streq): Update. (streq_hash): Add new declaration. * utils.c (streq): Return bool. (streq_hash): New function.
Diffstat (limited to 'gdb/completer.c')
-rw-r--r--gdb/completer.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/gdb/completer.c b/gdb/completer.c
index 4de1bcf..769dcf0 100644
--- a/gdb/completer.c
+++ b/gdb/completer.c
@@ -1469,7 +1469,7 @@ int max_completions = 200;
completion_tracker::completion_tracker ()
{
m_entries_hash = htab_create_alloc (INITIAL_COMPLETION_HTAB_SIZE,
- htab_hash_string, (htab_eq) streq,
+ htab_hash_string, streq_hash,
NULL, xcalloc, xfree);
}
@@ -1487,7 +1487,7 @@ completion_tracker::discard_completions ()
htab_delete (m_entries_hash);
m_entries_hash = htab_create_alloc (INITIAL_COMPLETION_HTAB_SIZE,
- htab_hash_string, (htab_eq) streq,
+ htab_hash_string, streq_hash,
NULL, xcalloc, xfree);
}