=================================================================== RCS file: /cvs/mandoc/Attic/man_hash.c,v retrieving revision 1.19 retrieving revision 1.24 diff -u -p -r1.19 -r1.24 --- mandoc/Attic/man_hash.c 2010/05/08 07:30:19 1.19 +++ mandoc/Attic/man_hash.c 2011/03/22 14:33:05 1.24 @@ -1,6 +1,6 @@ -/* $Id: man_hash.c,v 1.19 2010/05/08 07:30:19 kristaps Exp $ */ +/* $Id: man_hash.c,v 1.24 2011/03/22 14:33:05 kristaps Exp $ */ /* - * Copyright (c) 2008, 2009 Kristaps Dzonsons + * Copyright (c) 2008, 2009, 2010 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 @@ -26,14 +26,14 @@ #include #include +#include "man.h" +#include "mandoc.h" #include "libman.h" #define HASH_DEPTH 6 #define HASH_ROW(x) do { \ - if ('.' == (x)) \ - (x) = 26; \ - else if (isupper((u_char)(x))) \ + if (isupper((u_char)(x))) \ (x) -= 65; \ else \ (x) -= 97; \ @@ -47,7 +47,7 @@ * macro (the integer value of the enum stored as a char to save a bit * of space). */ -static u_char table[27 * HASH_DEPTH]; +static u_char table[26 * HASH_DEPTH]; /* * XXX - this hash has global scope, so if intended for use as a library @@ -66,7 +66,7 @@ man_hash_init(void) for (i = 0; i < (int)MAN_MAX; i++) { x = man_macronames[i][0]; - assert(isalpha((u_char)x) || '.' == x); + assert(isalpha((u_char)x)); HASH_ROW(x); @@ -89,7 +89,7 @@ man_hash_find(const char *tmp) if ('\0' == (x = tmp[0])) return(MAN_MAX); - if ( ! (isalpha((u_char)x) || '.' == x)) + if ( ! (isalpha((u_char)x))) return(MAN_MAX); HASH_ROW(x);