=================================================================== RCS file: /cvs/mandoc/Attic/man_hash.c,v retrieving revision 1.5 retrieving revision 1.9 diff -u -p -r1.5 -r1.9 --- mandoc/Attic/man_hash.c 2009/04/02 06:51:44 1.5 +++ mandoc/Attic/man_hash.c 2009/06/16 19:55:28 1.9 @@ -1,20 +1,18 @@ -/* $Id: man_hash.c,v 1.5 2009/04/02 06:51:44 kristaps Exp $ */ +/* $Id: man_hash.c,v 1.9 2009/06/16 19:55:28 kristaps Exp $ */ /* - * Copyright (c) 2008, 2009 Kristaps Dzonsons + * Copyright (c) 2008, 2009 Kristaps Dzonsons * * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the - * above copyright notice and this permission notice appear in all - * copies. + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE - * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ #include #include @@ -39,26 +37,26 @@ man_hash_alloc(void) int *htab; int i, j, x; - htab = calloc(26 * 4, sizeof(int)); + htab = calloc(26 * 5, sizeof(int)); if (NULL == htab) return(NULL); - 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 *= 4; + x *= 5; - for (j = 0; j < 4; j++) + for (j = 0; j < 5; j++) if (0 == htab[x + j]) { htab[x + j] = i; break; } - assert(j < 4); + assert(j < 5); } return((void *)htab); @@ -79,9 +77,9 @@ man_hash_find(const void *arg, const char *tmp) return(MAN_MAX); x -= (x <= 90) ? 65 : 97; - x *= 4; + x *= 5; - for (i = 0; i < 4; i++) { + for (i = 0; i < 5; i++) { if (0 == (tok = htab[x + i])) return(MAN_MAX); if (0 == strcmp(tmp, man_macronames[tok]))