=================================================================== RCS file: /cvs/mandoc/Attic/man_hash.c,v retrieving revision 1.8 retrieving revision 1.11 diff -u -p -r1.8 -r1.11 --- mandoc/Attic/man_hash.c 2009/06/10 20:18:43 1.8 +++ mandoc/Attic/man_hash.c 2009/08/19 09:14:50 1.11 @@ -1,4 +1,4 @@ -/* $Id: man_hash.c,v 1.8 2009/06/10 20:18:43 kristaps Exp $ */ +/* $Id: man_hash.c,v 1.11 2009/08/19 09:14:50 kristaps Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons * @@ -37,26 +37,30 @@ man_hash_alloc(void) int *htab; int i, j, x; - htab = calloc(26 * 5, sizeof(int)); + /* Initialised to -1. */ + + htab = malloc(26 * 6 * sizeof(int)); if (NULL == htab) return(NULL); + for (i = 0; i < 26 * 6; i++) + htab[i] = -1; - for (i = 1; i < MAN_MAX; i++) { + for (i = 0; i < MAN_MAX; i++) { x = man_macronames[i][0]; assert((x >= 65 && x <= 90) || (x >= 97 && x <= 122)); x -= (x <= 90) ? 65 : 97; - x *= 5; + x *= 6; - for (j = 0; j < 5; j++) - if (0 == htab[x + j]) { + for (j = 0; j < 6; j++) + if (-1 == htab[x + j]) { htab[x + j] = i; break; } - assert(j < 5); + assert(j < 6); } return((void *)htab); @@ -77,10 +81,10 @@ man_hash_find(const void *arg, const char *tmp) return(MAN_MAX); x -= (x <= 90) ? 65 : 97; - x *= 5; + x *= 6; - for (i = 0; i < 5; i++) { - if (0 == (tok = htab[x + i])) + for (i = 0; i < 6; i++) { + if (-1 == (tok = htab[x + i])) return(MAN_MAX); if (0 == strcmp(tmp, man_macronames[tok])) return(tok);