[BACK]Return to man_hash.c CVS log [TXT][DIR] Up to [cvsweb.bsd.lv] / mandoc

Diff for /mandoc/Attic/man_hash.c between version 1.26 and 1.35

version 1.26, 2014/03/23 11:25:26 version 1.35, 2016/07/15 18:03:45
Line 1 
Line 1 
 /*      $Id$ */  /*      $Id$ */
 /*  /*
  * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>   * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
    * Copyright (c) 2015 Ingo Schwarze <schwarze@openbsd.org>
  *   *
  * Permission to use, copy, modify, and distribute this software for any   * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above   * purpose with or without fee is hereby granted, provided that the above
Line 14 
Line 15 
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF   * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.   * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */   */
 #ifdef HAVE_CONFIG_H  
 #include "config.h"  #include "config.h"
 #endif  
   
 #include <sys/types.h>  #include <sys/types.h>
   
Line 25 
Line 24 
 #include <limits.h>  #include <limits.h>
 #include <string.h>  #include <string.h>
   
 #include "man.h"  
 #include "mandoc.h"  #include "mandoc.h"
   #include "roff.h"
   #include "man.h"
   #include "libmandoc.h"
 #include "libman.h"  #include "libman.h"
   
 #define HASH_DEPTH       6  #define HASH_DEPTH       6
Line 48 
Line 49 
  */   */
 static  unsigned 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.  
  */  
 void  void
 man_hash_init(void)  man_hash_init(void)
 {  {
         int              i, j, x;          int              i, j, x;
   
           if (*table != '\0')
                   return;
   
         memset(table, UCHAR_MAX, sizeof(table));          memset(table, UCHAR_MAX, sizeof(table));
   
         assert(/* LINTED */  
                         MAN_MAX < UCHAR_MAX);  
   
         for (i = 0; i < (int)MAN_MAX; i++) {          for (i = 0; i < (int)MAN_MAX; i++) {
                 x = man_macronames[i][0];                  x = man_macronames[i][0];
   
Line 79  man_hash_init(void)
Line 77  man_hash_init(void)
         }          }
 }  }
   
   int
 enum mant  
 man_hash_find(const char *tmp)  man_hash_find(const char *tmp)
 {  {
         int              x, y, i;          int              x, y, i;
         enum mant        tok;          int              tok;
   
         if ('\0' == (x = tmp[0]))          if ('\0' == (x = tmp[0]))
                 return(MAN_MAX);                  return TOKEN_NONE;
         if ( ! (isalpha((unsigned char)x)))          if ( ! (isalpha((unsigned char)x)))
                 return(MAN_MAX);                  return TOKEN_NONE;
   
         HASH_ROW(x);          HASH_ROW(x);
   
         for (i = 0; i < HASH_DEPTH; i++) {          for (i = 0; i < HASH_DEPTH; i++) {
                 if (UCHAR_MAX == (y = table[x + i]))                  if (UCHAR_MAX == (y = table[x + i]))
                         return(MAN_MAX);                          return TOKEN_NONE;
   
                 tok = (enum mant)y;                  tok = y;
                 if (0 == strcmp(tmp, man_macronames[tok]))                  if (0 == strcmp(tmp, man_macronames[tok]))
                         return(tok);                          return tok;
         }          }
   
         return(MAN_MAX);          return TOKEN_NONE;
 }  }
Legend:
Removed from v.1.26  
changed lines
  Added in v.1.35
CVSweb