mandoc/man_hash.c - diff

Return to man_hash.c CVS log

Up to [cvsweb.bsd.lv] / mandoc

Diff for /mandoc/Attic/man_hash.c between version 1.3 and 1.7

-version 1.3, 2009/03/26 09:55:39
+version 1.7, 2009/04/12 19:45:26
 Line 1
 Line 1
 Line 1
- /* $Id$ */
+ /*      $Id$ */
  /*
   * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@openbsd.org>
   *
   * Permission to use, copy, modify, and distribute this software for any
-  * purpose with or without fee is hereby granted, provided that the
+  * purpose with or without fee is hereby granted, provided that the above
-  * above copyright notice and this permission notice appear in all
+  * copyright notice and this permission notice appear in all copies.
-  * copies.
   *
-  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
+  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-  * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
+  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-  * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
+  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-  * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
+  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-  * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
+  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-  * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-  * PERFORMANCE OF THIS SOFTWARE.
   */
  #include <assert.h>
- #include <ctype.h>
- #include <err.h>
  #include <stdlib.h>
- #include <stdio.h>
  #include <string.h>
  #include "libman.h"
  /* ARGUSED */
  void
  man_hash_free(void *htab)
  {
-         /* Do nothing. */
+         free(htab);
  }
-Line 38  man_hash_free(void *htab)
+Line 34  man_hash_free(void *htab)
 Line 38  man_hash_free(void *htab)
 Line 34  man_hash_free(void *htab)
  void *
  man_hash_alloc(void)
  {
+         int             *htab;
+         int              i, j, x;
-         /* Do nothing. */
+         htab = calloc(26 * 5, sizeof(int));
-         return(NULL);
+         if (NULL == htab)
+                 return(NULL);
+         for (i = 1; i < MAN_MAX; i++) {
+                 x = man_macronames[i][0];
+                 assert((x >= 65 && x <= 90) ||
+                                 (x >= 97 && x <= 122));
+                 x -= (x <= 90) ? 65 : 97;
+                 x *= 5;
+                 for (j = 0; j < 5; j++)
+                         if (0 == htab[x + j]) {
+                                 htab[x + j] = i;
+                                 break;
+                         }
+                 assert(j < 5);
+         }
+         return((void *)htab);
  }
  int
  man_hash_find(const void *arg, const char *tmp)
  {
-         int              i;
+         int              x, i, tok;
+         const int       *htab;
-         /* TODO */
+         htab = (const int *)arg;
-         for (i = 0; i < MAN_MAX; i++)
+         if (0 == (x = tmp[0]))
-                 if (0 == strcmp(tmp, man_macronames[i]))
+                 return(MAN_MAX);
-                         return(i);
+         if ( ! ((x >= 65 && x <= 90) || (x >= 97 && x <= 122)))
+                 return(MAN_MAX);
+         x -= (x <= 90) ? 65 : 97;
+         x *= 5;
+         for (i = 0; i < 5; i++) {
+                 if (0 == (tok = htab[x + i]))
+                         return(MAN_MAX);
+                 if (0 == strcmp(tmp, man_macronames[tok]))
+                         return(tok);
+         }
          return(MAN_MAX);
  }

CVSweb