Changeset 24 for branches/FREEBSD/src/kmk/hash.c

Timestamp:

Nov 26, 2002, 10:24:54 PM (23 years ago)

Author:

bird

Message:

Import of RELENG_4_7_0_RELEASE

File:

• branches/FREEBSD/src/kmk/hash.c (modified) (15 diffs)

branches/FREEBSD/src/kmk/hash.c

@@ -1 +1 @@
 /*
- * Copyright (c) 1988, 1989, 1990, 1993
- *      The Regents of the University of California.  All rights reserved.
+ * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
  * Copyright (c) 1988, 1989 by Adam de Boor
  * Copyright (c) 1989 by Berkeley Softworks
@@ -36 +35 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * @(#)hash.c   8.1 (Berkeley) 6/6/93
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/usr.bin/make/hash.c,v 1.18 2002/10/09 03:42:10 jmallett Exp $");
+ */
+
+#ifndef lint
+#if 0
+static char sccsid[] = "@(#)hash.c      8.1 (Berkeley) 6/6/93";
+#else
+static const char rcsid[] =
+  "$FreeBSD: src/usr.bin/make/hash.c,v 1.9 1999/09/11 13:08:01 hoek Exp $";
+#endif
+#endif /* not lint */
 
 /* hash.c --
@@ -50 +53 @@
  *      information increases.
  */
-#include <unistd.h>
 #include "sprite.h"
 #include "make.h"
@@ -60 +62 @@
  */
 
-static void RebuildTable(Hash_Table *);
+static void RebuildTable __P((Hash_Table *));
 
 /*
@@ -67 +69 @@
  */
 
-#define rebuildLimit 8
+#define rebuildLimit 8
 
 /*
@@ -73 +75 @@
  *
  * Hash_InitTable --
- * 
- *      Set up the hash table t with a given number of buckets, or a
- *      reasonable default if the number requested is less than or
- *      equal to zero.  Hash tables will grow in size as needed.
- *
+ *
+ *      This routine just sets up the hash table.
  *
  * Results:
@@ -89 +88 @@
 
 void
-Hash_InitTable(Hash_Table *t, int numBuckets)
-{
-        int i;
-        struct Hash_Entry **hp;
+Hash_InitTable(t, numBuckets)
+        register Hash_Table *t; /* Structure to use to hold table. */
+        int numBuckets;         /* How many buckets to create for starters.
+                                 * This number is rounded up to a power of
+                                 * two.   If <= 0, a reasonable default is
+                                 * chosen. The table will grow in size later
+                                 * as needed. */
+{
+        register int i;
+        register struct Hash_Entry **hp;
 
         /*
@@ -130 +135 @@
 
 void
-Hash_DeleteTable(Hash_Table *t)
-{
-        struct Hash_Entry **hp, *h, *nexth = NULL;
-        int i;
+Hash_DeleteTable(t)
+        Hash_Table *t;
+{
+        register struct Hash_Entry **hp, *h, *nexth = NULL;
+        register int i;
 
         for (hp = t->bucketPtr, i = t->size; --i >= 0;) {
@@ -169 +175 @@
 
 Hash_Entry *
-Hash_FindEntry(Hash_Table *t, char *key)
-{
-        Hash_Entry *e;
-        unsigned h;
-        char *p;
+Hash_FindEntry(t, key)
+        Hash_Table *t;          /* Hash table to search. */
+        char *key;              /* A hash key. */
+{
+        register Hash_Entry *e;
+        register unsigned h;
+        register char *p;
 
         for (h = 0, p = key; *p;)
@@ -204 +212 @@
 
 Hash_Entry *
-Hash_CreateEntry(Hash_Table *t, char *key, Boolean *newPtr)
-{
-        Hash_Entry *e;
-        unsigned int h;
-        char *p;
+Hash_CreateEntry(t, key, newPtr)
+        register Hash_Table *t; /* Hash table to search. */
+        char *key;              /* A hash key. */
+        Boolean *newPtr;        /* Filled in with TRUE if new entry created,
+                                 * FALSE otherwise. */
+{
+        register Hash_Entry *e;
+        register unsigned h;
+        register char *p;
         int keylen;
         struct Hash_Entry **hp;
@@ -267 +279 @@
 
 void
-Hash_DeleteEntry(Hash_Table *t, Hash_Entry *e)
-{
-        Hash_Entry **hp, *p;
+Hash_DeleteEntry(t, e)
+        Hash_Table *t;
+        Hash_Entry *e;
+{
+        register Hash_Entry **hp, *p;
 
         if (e == NULL)
@@ -282 +296 @@
                 }
         }
-        (void) write(STDERR_FILENO, "bad call to Hash_DeleteEntry\n", 29);
+        (void) write(2, "bad call to Hash_DeleteEntry\n", 29);
         abort();
 }
@@ -306 +320 @@
 
 Hash_Entry *
-Hash_EnumFirst(Hash_Table *t, Hash_Search *searchPtr)
+Hash_EnumFirst(t, searchPtr)
+        Hash_Table *t;                  /* Table to be searched. */
+        register Hash_Search *searchPtr;/* Area in which to keep state
+                                         * about search.*/
 {
         searchPtr->tablePtr = t;
@@ -333 +350 @@
 
 Hash_Entry *
-Hash_EnumNext(Hash_Search *searchPtr)
-{
-        Hash_Entry *e;
+Hash_EnumNext(searchPtr)
+        register Hash_Search *searchPtr; /* Area used to keep state about
+                                            search. */
+{
+        register Hash_Entry *e;
         Hash_Table *t = searchPtr->tablePtr;
 
         /*
          * The hashEntryPtr field points to the most recently returned
-         * entry, or is NULL if we are starting up.  If not NULL, we have
+         * entry, or is nil if we are starting up.  If not nil, we have
          * to start at the next one in the chain.
          */
@@ -377 +396 @@
 
 static void
-RebuildTable(Hash_Table *t)
-{
-        Hash_Entry *e, *next = NULL, **hp, **xp;
-        int i, mask;
-        Hash_Entry **oldhp;
+RebuildTable(t)
+        register Hash_Table *t;
+{
+        register Hash_Entry *e, *next = NULL, **hp, **xp;
+        register int i, mask;
+        register Hash_Entry **oldhp;
         int oldsize;