* [PATCH] nss: Unnest nested function add_key
@ 2021-10-15 5:32 Fangrui Song
2021-10-15 7:18 ` Florian Weimer
0 siblings, 1 reply; 2+ messages in thread
From: Fangrui Song @ 2021-10-15 5:32 UTC (permalink / raw)
To: libc-alpha
Add one static variable `db`, but make makedb.c compilable with Clang.
---
nss/makedb.c | 78 +++++++++++++++++++++++++++-------------------------
1 file changed, 40 insertions(+), 38 deletions(-)
diff --git a/nss/makedb.c b/nss/makedb.c
index 30c3d0426e..cc09e822d8 100644
--- a/nss/makedb.c
+++ b/nss/makedb.c
@@ -618,6 +618,45 @@ next_prime (size_t seed)
return seed;
}
+static struct database *cur_db;
+static size_t max_chainlength;
+static char *wp;
+static size_t nhashentries;
+static bool copy_string;
+
+void add_key(const void *nodep, const VISIT which, const int depth)
+{
+ if (which != leaf && which != postorder)
+ return;
+
+ const struct dbentry *dbe = *(const struct dbentry **) nodep;
+
+ ptrdiff_t stridx;
+ if (copy_string)
+ {
+ stridx = wp - cur_db->keystrtab;
+ wp = stpcpy (wp, dbe->str) + 1;
+ }
+ else
+ stridx = 0;
+
+ size_t hidx = dbe->hashval % nhashentries;
+ size_t hval2 = 1 + dbe->hashval % (nhashentries - 2);
+ size_t chainlength = 0;
+
+ while (cur_db->hashtable[hidx] != ~((stridx_t) 0))
+ {
+ ++chainlength;
+ if ((hidx += hval2) >= nhashentries)
+ hidx -= nhashentries;
+ }
+
+ cur_db->hashtable[hidx] = ((cur_db->extra_string ? valstrlen : 0)
+ + dbe->validx);
+ cur_db->keyidxtab[hidx] = stridx;
+
+ max_chainlength = MAX (max_chainlength, chainlength);
+}
static void
compute_tables (void)
@@ -649,44 +688,7 @@ compute_tables (void)
db->keyidxtab = db->hashtable + nhashentries_max;
db->keystrtab = (char *) (db->keyidxtab + nhashentries_max);
- static size_t max_chainlength;
- static char *wp;
- static size_t nhashentries;
- static bool copy_string;
-
- void add_key(const void *nodep, const VISIT which, const int depth)
- {
- if (which != leaf && which != postorder)
- return;
-
- const struct dbentry *dbe = *(const struct dbentry **) nodep;
-
- ptrdiff_t stridx;
- if (copy_string)
- {
- stridx = wp - db->keystrtab;
- wp = stpcpy (wp, dbe->str) + 1;
- }
- else
- stridx = 0;
-
- size_t hidx = dbe->hashval % nhashentries;
- size_t hval2 = 1 + dbe->hashval % (nhashentries - 2);
- size_t chainlength = 0;
-
- while (db->hashtable[hidx] != ~((stridx_t) 0))
- {
- ++chainlength;
- if ((hidx += hval2) >= nhashentries)
- hidx -= nhashentries;
- }
-
- db->hashtable[hidx] = ((db->extra_string ? valstrlen : 0)
- + dbe->validx);
- db->keyidxtab[hidx] = stridx;
-
- max_chainlength = MAX (max_chainlength, chainlength);
- }
+ cur_db = db;
copy_string = false;
nhashentries = nhashentries_min;
--
2.33.0.1079.g6e70778dc9-goog
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] nss: Unnest nested function add_key
2021-10-15 5:32 [PATCH] nss: Unnest nested function add_key Fangrui Song
@ 2021-10-15 7:18 ` Florian Weimer
0 siblings, 0 replies; 2+ messages in thread
From: Florian Weimer @ 2021-10-15 7:18 UTC (permalink / raw)
To: Fangrui Song via Libc-alpha
* Fangrui Song via Libc-alpha:
> Add one static variable `db`, but make makedb.c compilable with Clang.
“cur_db”?
Please use the twalk_r function, it was added for such situations.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-10-15 7:18 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-10-15 5:32 [PATCH] nss: Unnest nested function add_key Fangrui Song
2021-10-15 7:18 ` Florian Weimer
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).