=================================================================== RCS file: /cvs/mandoc/Attic/man_hash.c,v retrieving revision 1.32 retrieving revision 1.35 diff -u -p -r1.32 -r1.35 --- mandoc/Attic/man_hash.c 2015/04/18 17:01:58 1.32 +++ mandoc/Attic/man_hash.c 2016/07/15 18:03:45 1.35 @@ -1,6 +1,7 @@ -/* $Id: man_hash.c,v 1.32 2015/04/18 17:01:58 schwarze Exp $ */ +/* $Id: man_hash.c,v 1.35 2016/07/15 18:03:45 schwarze Exp $ */ /* * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons + * Copyright (c) 2015 Ingo Schwarze * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -23,8 +24,10 @@ #include #include +#include "mandoc.h" #include "roff.h" #include "man.h" +#include "libmandoc.h" #include "libman.h" #define HASH_DEPTH 6 @@ -57,8 +60,6 @@ man_hash_init(void) memset(table, UCHAR_MAX, sizeof(table)); - assert(MAN_MAX < UCHAR_MAX); - for (i = 0; i < (int)MAN_MAX; i++) { x = man_macronames[i][0]; @@ -83,20 +84,20 @@ man_hash_find(const char *tmp) int tok; if ('\0' == (x = tmp[0])) - return(MAN_MAX); + return TOKEN_NONE; if ( ! (isalpha((unsigned char)x))) - return(MAN_MAX); + return TOKEN_NONE; HASH_ROW(x); for (i = 0; i < HASH_DEPTH; i++) { if (UCHAR_MAX == (y = table[x + i])) - return(MAN_MAX); + return TOKEN_NONE; tok = y; if (0 == strcmp(tmp, man_macronames[tok])) - return(tok); + return tok; } - return(MAN_MAX); + return TOKEN_NONE; }