public inbox for gdb-cvs@sourceware.org
help / color / mirror / Atom feed
* [binutils-gdb] Move hash_entry and eq_entry into cooked_index::do_finalize
@ 2023-01-17 14:05 Tom Tromey
0 siblings, 0 replies; only message in thread
From: Tom Tromey @ 2023-01-17 14:05 UTC (permalink / raw)
To: gdb-cvs
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=5a89072f36ddd3be71103e3806d42ff5e49ff616
commit 5a89072f36ddd3be71103e3806d42ff5e49ff616
Author: Tom Tromey <tromey@adacore.com>
Date: Thu Dec 15 09:38:05 2022 -0700
Move hash_entry and eq_entry into cooked_index::do_finalize
I was briefly confused by the hash_entry and eq_entry functions in the
cooked index. They are only needed in a single method, and that
method already has a couple of local lambdas for a different hash
table. So, it seemed cleaner to move these there as well.
Diff:
---
gdb/dwarf2/cooked-index.c | 34 ++++++++++++++--------------------
1 file changed, 14 insertions(+), 20 deletions(-)
diff --git a/gdb/dwarf2/cooked-index.c b/gdb/dwarf2/cooked-index.c
index 93ffd923c76..c711e3b9b2a 100644
--- a/gdb/dwarf2/cooked-index.c
+++ b/gdb/dwarf2/cooked-index.c
@@ -26,26 +26,6 @@
#include "split-name.h"
#include <algorithm>
-/* Hash function for cooked_index_entry. */
-
-static hashval_t
-hash_entry (const void *e)
-{
- const cooked_index_entry *entry = (const cooked_index_entry *) e;
- return dwarf5_djb_hash (entry->canonical);
-}
-
-/* Equality function for cooked_index_entry. */
-
-static int
-eq_entry (const void *a, const void *b)
-{
- const cooked_index_entry *ae = (const cooked_index_entry *) a;
- const gdb::string_view *sv = (const gdb::string_view *) b;
- return (strlen (ae->canonical) == sv->length ()
- && strncasecmp (ae->canonical, sv->data (), sv->length ()) == 0);
-}
-
/* See cooked-index.h. */
const char *
@@ -191,6 +171,20 @@ cooked_index::do_finalize ()
htab_up seen_names (htab_create_alloc (10, hash_name_ptr, eq_name_ptr,
nullptr, xcalloc, xfree));
+ auto hash_entry = [] (const void *e)
+ {
+ const cooked_index_entry *entry = (const cooked_index_entry *) e;
+ return dwarf5_djb_hash (entry->canonical);
+ };
+
+ auto eq_entry = [] (const void *a, const void *b) -> int
+ {
+ const cooked_index_entry *ae = (const cooked_index_entry *) a;
+ const gdb::string_view *sv = (const gdb::string_view *) b;
+ return (strlen (ae->canonical) == sv->length ()
+ && strncasecmp (ae->canonical, sv->data (), sv->length ()) == 0);
+ };
+
htab_up gnat_entries (htab_create_alloc (10, hash_entry, eq_entry,
nullptr, xcalloc, xfree));
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2023-01-17 14:05 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-01-17 14:05 [binutils-gdb] Move hash_entry and eq_entry into cooked_index::do_finalize Tom Tromey
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).