=================================================================== RCS file: /cvs/mandoc/Attic/mdoc_hash.c,v retrieving revision 1.22 retrieving revision 1.24 diff -u -p -r1.22 -r1.24 --- mandoc/Attic/mdoc_hash.c 2015/04/02 21:36:50 1.22 +++ mandoc/Attic/mdoc_hash.c 2015/04/18 17:01:58 1.24 @@ -1,4 +1,4 @@ -/* $Id: mdoc_hash.c,v 1.22 2015/04/02 21:36:50 schwarze Exp $ */ +/* $Id: mdoc_hash.c,v 1.24 2015/04/18 17:01:58 schwarze Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons * @@ -32,16 +32,15 @@ static unsigned char table[27 * 12]; -/* - * XXX - this hash has global scope, so if intended for use as a library - * with multiple callers, it will need re-invocation protection. - */ void mdoc_hash_init(void) { int i, j, major; const char *p; + if (*table != '\0') + return; + memset(table, UCHAR_MAX, sizeof(table)); for (i = 0; i < (int)MDOC_MAX; i++) { @@ -62,7 +61,7 @@ mdoc_hash_init(void) } } -enum mdoct +int mdoc_hash_find(const char *p) { int major, i, j; @@ -86,7 +85,7 @@ mdoc_hash_find(const char *p) if (UCHAR_MAX == (i = table[major + j])) break; if (0 == strcmp(p, mdoc_macronames[i])) - return((enum mdoct)i); + return(i); } return(MDOC_MAX);