From 8371d797ade89c0a977b6e8fd9bbd35ab7cf4e2c Mon Sep 17 00:00:00 2001 From: Tim Edwards Date: Thu, 26 Dec 2024 15:29:54 -0500 Subject: [PATCH] Revised some code from PR#352 in response to questions from Darryl Miles. Updated the version number to go along with the merge of a number of pull requests done today. --- VERSION | 2 +- irouter/irCommand.c | 4 +--- utils/hash.c | 5 ++++- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/VERSION b/VERSION index 8548cb1c..c78b6ce5 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -8.3.508 +8.3.509 diff --git a/irouter/irCommand.c b/irouter/irCommand.c index 699dc70c..80c80e82 100644 --- a/irouter/irCommand.c +++ b/irouter/irCommand.c @@ -585,9 +585,7 @@ irWzdSetBloomLimit(s,file) char *s; FILE *file; { - dlong tmp; - SetNoisyDI(&tmp,s,file); - irMazeParms->mp_bloomLimit = tmp; /* FIXME should this be truncated ? */ + SetNoisyInt(&(irMazeParms->mp_bloomLimit),s,file); } /* irWzdSetBoundsIncrement -- */ diff --git a/utils/hash.c b/utils/hash.c index a72611ab..5f57663c 100644 --- a/utils/hash.c +++ b/utils/hash.c @@ -692,10 +692,13 @@ HashKill(table) for (hp = table->ht_table, hend = &hp[table->ht_size]; hp < hend; hp++) for (h = *hp; h != NIL; h = h->h_next) { - const void *p = h->h_key.h_ptr; + const void *p; freeMagic((char *) h); if (killFn) + { + p = h->h_key.h_ptr; (*killFn)((void *)p); + } } freeMagic((char *) table->ht_table);