=================================================================== RCS file: /cvs/mandoc/Attic/man_hash.c,v retrieving revision 1.24 retrieving revision 1.27 diff -u -p -r1.24 -r1.27 --- mandoc/Attic/man_hash.c 2011/03/22 14:33:05 1.24 +++ mandoc/Attic/man_hash.c 2014/04/20 16:46:04 1.27 @@ -1,4 +1,4 @@ -/* $Id: man_hash.c,v 1.24 2011/03/22 14:33:05 kristaps Exp $ */ +/* $Id: man_hash.c,v 1.27 2014/04/20 16:46:04 schwarze Exp $ */ /* * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons * @@ -23,7 +23,6 @@ #include #include #include -#include #include #include "man.h" @@ -33,7 +32,7 @@ #define HASH_DEPTH 6 #define HASH_ROW(x) do { \ - if (isupper((u_char)(x))) \ + if (isupper((unsigned char)(x))) \ (x) -= 65; \ else \ (x) -= 97; \ @@ -47,8 +46,9 @@ * macro (the integer value of the enum stored as a char to save a bit * of space). */ -static u_char table[26 * HASH_DEPTH]; +static unsigned char table[26 * HASH_DEPTH]; + /* * XXX - this hash has global scope, so if intended for use as a library * with multiple callers, it will need re-invocation protection. @@ -60,19 +60,18 @@ man_hash_init(void) memset(table, UCHAR_MAX, sizeof(table)); - assert(/* LINTED */ - MAN_MAX < UCHAR_MAX); + assert(MAN_MAX < UCHAR_MAX); for (i = 0; i < (int)MAN_MAX; i++) { x = man_macronames[i][0]; - assert(isalpha((u_char)x)); + assert(isalpha((unsigned char)x)); HASH_ROW(x); for (j = 0; j < HASH_DEPTH; j++) if (UCHAR_MAX == table[x + j]) { - table[x + j] = (u_char)i; + table[x + j] = (unsigned char)i; break; } @@ -80,7 +79,6 @@ man_hash_init(void) } } - enum mant man_hash_find(const char *tmp) { @@ -89,7 +87,7 @@ man_hash_find(const char *tmp) if ('\0' == (x = tmp[0])) return(MAN_MAX); - if ( ! (isalpha((u_char)x))) + if ( ! (isalpha((unsigned char)x))) return(MAN_MAX); HASH_ROW(x);