[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.15 and 1.26

version 1.15, 2009/09/23 11:53:45 version 1.26, 2014/03/23 11:25:26
Line 1 
Line 1 
 /*      $Id$ */  /*      $Id$ */
 /*  /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>   * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  *   *
  * 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 14 
  * 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"
   #endif
   
 #include <sys/types.h>  #include <sys/types.h>
   
 #include <assert.h>  #include <assert.h>
   #include <ctype.h>
 #include <limits.h>  #include <limits.h>
 #include <stdlib.h>  
 #include <string.h>  #include <string.h>
   
   #include "man.h"
   #include "mandoc.h"
 #include "libman.h"  #include "libman.h"
   
 static  u_char          table[26 * 6];  #define HASH_DEPTH       6
   
   #define HASH_ROW(x) do { \
                   if (isupper((unsigned char)(x))) \
                           (x) -= 65; \
                   else \
                           (x) -= 97; \
                   (x) *= HASH_DEPTH; \
           } while (/* CONSTCOND */ 0)
   
 /*  /*
    * Lookup table is indexed first by lower-case first letter (plus one
    * for the period, which is stored in the last row), then by lower or
    * uppercase second letter.  Buckets correspond to the index of the
    * macro (the integer value of the enum stored as a char to save a bit
    * of space).
    */
   static  unsigned char    table[26 * HASH_DEPTH];
   
   /*
  * XXX - this hash has global scope, so if intended for use as a library   * XXX - this hash has global scope, so if intended for use as a library
  * with multiple callers, it will need re-invocation protection.   * with multiple callers, it will need re-invocation protection.
  */   */
Line 36  man_hash_init(void)
Line 59  man_hash_init(void)
   
         memset(table, UCHAR_MAX, sizeof(table));          memset(table, UCHAR_MAX, sizeof(table));
   
         for (i = 0; i < MAN_MAX; i++) {          assert(/* LINTED */
                           MAN_MAX < UCHAR_MAX);
   
           for (i = 0; i < (int)MAN_MAX; i++) {
                 x = man_macronames[i][0];                  x = man_macronames[i][0];
                 assert((x >= 65 && x <= 90) ||  
                                 (x >= 97 && x <= 122));  
   
                 x -= (x <= 90) ? 65 : 97;                  assert(isalpha((unsigned char)x));
                 x *= 6;  
   
                 for (j = 0; j < 6; j++)                  HASH_ROW(x);
   
                   for (j = 0; j < HASH_DEPTH; j++)
                         if (UCHAR_MAX == table[x + j]) {                          if (UCHAR_MAX == table[x + j]) {
                                 table[x + j] = (u_char)i;                                  table[x + j] = (unsigned char)i;
                                 break;                                  break;
                         }                          }
                 assert(j < 6);  
                   assert(j < HASH_DEPTH);
         }          }
 }  }
   
 int  
   enum mant
 man_hash_find(const char *tmp)  man_hash_find(const char *tmp)
 {  {
         int              x, i, tok;          int              x, y, i;
           enum mant        tok;
   
         if (0 == (x = tmp[0]))          if ('\0' == (x = tmp[0]))
                 return(MAN_MAX);                  return(MAN_MAX);
         if ( ! ((x >= 65 && x <= 90) || (x >= 97 && x <= 122)))          if ( ! (isalpha((unsigned char)x)))
                 return(MAN_MAX);                  return(MAN_MAX);
   
         x -= (x <= 90) ? 65 : 97;          HASH_ROW(x);
         x *= 6;  
   
         for (i = 0; i < 6; i++) {          for (i = 0; i < HASH_DEPTH; i++) {
                 if (UCHAR_MAX == (tok = table[x + i]))                  if (UCHAR_MAX == (y = table[x + i]))
                         return(MAN_MAX);                          return(MAN_MAX);
   
                   tok = (enum mant)y;
                 if (0 == strcmp(tmp, man_macronames[tok]))                  if (0 == strcmp(tmp, man_macronames[tok]))
                         return(tok);                          return(tok);
         }          }
Legend:
Removed from v.1.15  
changed lines
  Added in v.1.26
CVSweb