=================================================================== RCS file: /cvs/mandoc/Attic/man_hash.c,v retrieving revision 1.22 retrieving revision 1.26 diff -u -p -r1.22 -r1.26 --- mandoc/Attic/man_hash.c 2010/06/19 20:46:28 1.22 +++ mandoc/Attic/man_hash.c 2014/03/23 11:25:26 1.26 @@ -1,6 +1,6 @@ -/* $Id: man_hash.c,v 1.22 2010/06/19 20:46:28 kristaps Exp $ */ +/* $Id: man_hash.c,v 1.26 2014/03/23 11:25:26 schwarze 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 @@ -23,16 +23,16 @@ #include #include #include -#include #include +#include "man.h" #include "mandoc.h" #include "libman.h" #define HASH_DEPTH 6 #define HASH_ROW(x) do { \ - if (isupper((u_char)(x))) \ + if (isupper((unsigned char)(x))) \ (x) -= 65; \ else \ (x) -= 97; \ @@ -46,7 +46,7 @@ * 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 @@ -65,13 +65,13 @@ man_hash_init(void) 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; } @@ -88,7 +88,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);