summaryrefslogtreecommitdiffstats
path: root/man_hash.c
diff options
context:
space:
mode:
authorKristaps Dzonsons <kristaps@bsd.lv>2009-09-16 14:40:56 +0000
committerKristaps Dzonsons <kristaps@bsd.lv>2009-09-16 14:40:56 +0000
commit6345042a457de84d0b4fdb0ffe8e21052479fdbc (patch)
treea033285b86728a45a837dff5d7d34369d7055e0a /man_hash.c
parent464bf99c7bec33718cdc95c963d3e5d3a28b3124 (diff)
downloadmandoc-6345042a457de84d0b4fdb0ffe8e21052479fdbc.tar.gz
Lookup hashes are now static tables, ordered first-level by second character, then randomly along a chain. Improves performance by a small fraction and considerably cleans up hash sources.
Diffstat (limited to 'man_hash.c')
-rw-r--r--man_hash.c39
1 files changed, 9 insertions, 30 deletions
diff --git a/man_hash.c b/man_hash.c
index abd2408a..9d8f6c09 100644
--- a/man_hash.c
+++ b/man_hash.c
@@ -15,39 +15,25 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
#include <assert.h>
+#include <limits.h>
#include <stdlib.h>
#include <string.h>
#include "libman.h"
-/* ARGUSED */
-void
-man_hash_free(void *htab)
-{
-
- free(htab);
-}
+static unsigned char table[26 * 6];
-/* ARGUSED */
-void *
-man_hash_alloc(void)
+void
+man_hash_init(void)
{
- int *htab;
int i, j, x;
- /* Initialised to -1. */
-
- htab = malloc(26 * 6 * sizeof(int));
- if (NULL == htab)
- return(NULL);
- for (i = 0; i < 26 * 6; i++)
- htab[i] = -1;
+ memset(table, UCHAR_MAX, sizeof(table));
for (i = 0; i < MAN_MAX; i++) {
x = man_macronames[i][0];
-
assert((x >= 65 && x <= 90) ||
(x >= 97 && x <= 122));
@@ -55,25 +41,19 @@ man_hash_alloc(void)
x *= 6;
for (j = 0; j < 6; j++)
- if (-1 == htab[x + j]) {
- htab[x + j] = i;
+ if (UCHAR_MAX == table[x + j]) {
+ table[x + j] = i;
break;
}
-
assert(j < 6);
}
-
- return((void *)htab);
}
int
-man_hash_find(const void *arg, const char *tmp)
+man_hash_find(const char *tmp)
{
int x, i, tok;
- const int *htab;
-
- htab = (const int *)arg;
if (0 == (x = tmp[0]))
return(MAN_MAX);
@@ -84,7 +64,7 @@ man_hash_find(const void *arg, const char *tmp)
x *= 6;
for (i = 0; i < 6; i++) {
- if (-1 == (tok = htab[x + i]))
+ if (UCHAR_MAX == (tok = table[x + i]))
return(MAN_MAX);
if (0 == strcmp(tmp, man_macronames[tok]))
return(tok);
@@ -92,4 +72,3 @@ man_hash_find(const void *arg, const char *tmp)
return(MAN_MAX);
}
-