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

Diff for /mandoc/Attic/mdoc_hash.c between version 1.19 and 1.26

version 1.19, 2014/03/23 11:25:26 version 1.26, 2015/10/06 18:32:19
Line 1 
Line 1 
 /*      $Id$ */  /*      $Id$ */
 /*  /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@bsd.lv>   * Copyright (c) 2008, 2009 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 27 
Line 26 
 #include <stdio.h>  #include <stdio.h>
 #include <string.h>  #include <string.h>
   
   #include "roff.h"
 #include "mdoc.h"  #include "mdoc.h"
 #include "libmdoc.h"  #include "libmdoc.h"
   
 static  unsigned char    table[27 * 12];  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  void
 mdoc_hash_init(void)  mdoc_hash_init(void)
 {  {
         int              i, j, major;          int              i, j, major;
         const char      *p;          const char      *p;
   
           if (*table != '\0')
                   return;
   
         memset(table, UCHAR_MAX, sizeof(table));          memset(table, UCHAR_MAX, sizeof(table));
   
         for (i = 0; i < (int)MDOC_MAX; i++) {          for (i = 0; i < (int)MDOC_MAX; i++) {
Line 62  mdoc_hash_init(void)
Line 62  mdoc_hash_init(void)
         }          }
 }  }
   
 enum mdoct  int
 mdoc_hash_find(const char *p)  mdoc_hash_find(const char *p)
 {  {
         int               major, i, j;          int               major, i, j;
   
         if (0 == p[0])          if (0 == p[0])
                 return(MDOC_MAX);                  return TOKEN_NONE;
         if ( ! isalpha((unsigned char)p[0]) && '%' != p[0])          if ( ! isalpha((unsigned char)p[0]) && '%' != p[0])
                 return(MDOC_MAX);                  return TOKEN_NONE;
   
         if (isalpha((unsigned char)p[1]))          if (isalpha((unsigned char)p[1]))
                 major = 12 * (tolower((unsigned char)p[1]) - 97);                  major = 12 * (tolower((unsigned char)p[1]) - 97);
         else if ('1' == p[1])          else if ('1' == p[1])
                 major = 12 * 26;                  major = 12 * 26;
         else          else
                 return(MDOC_MAX);                  return TOKEN_NONE;
   
         if (p[2] && p[3])          if (p[2] && p[3])
                 return(MDOC_MAX);                  return TOKEN_NONE;
   
         for (j = 0; j < 12; j++) {          for (j = 0; j < 12; j++) {
                 if (UCHAR_MAX == (i = table[major + j]))                  if (UCHAR_MAX == (i = table[major + j]))
                         break;                          break;
                 if (0 == strcmp(p, mdoc_macronames[i]))                  if (0 == strcmp(p, mdoc_macronames[i]))
                         return((enum mdoct)i);                          return i;
         }          }
   
         return(MDOC_MAX);          return TOKEN_NONE;
 }  }
Legend:
Removed from v.1.19  
changed lines
  Added in v.1.26
CVSweb