replace hash.c; speedup/cleanup from Chris Torek

[unix-history] / usr / src / usr.bin / make / targ.c

diff --git a/usr/src/usr.bin/make/targ.c b/usr/src/usr.bin/make/targ.c
index efbedaf..e3061e9 100644 (file)
--- a/usr/src/usr.bin/make/targ.c
+++ b/usr/src/usr.bin/make/targ.c
@@ -7,21 +7,11 @@
  * This code is derived from software contributed to Berkeley by
  * Adam de Boor.
  *
  * This code is derived from software contributed to Berkeley by
  * Adam de Boor.
  *

- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by the University of California, Berkeley.  The name of the
- * University may not be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * %sccs.include.redist.c%

  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)targ.c     5.2 (Berkeley) %G%";
+static char sccsid[] = "@(#)targ.c     5.8 (Berkeley) %G%";

 #endif /* not lint */
 
 /*-
 #endif /* not lint */
 
 /*-


@@ -89,9 +79,9 @@ void
 Targ_Init ()
 {
     allTargets = Lst_Init (FALSE);
 Targ_Init ()
 {
     allTargets = Lst_Init (FALSE);

-    Hash_InitTable (&targets, HTSIZE, HASH_STRING_KEYS);
+    Hash_InitTable (&targets, HTSIZE);

 }
 }

-\f
+

 /*-
  *-----------------------------------------------------------------------
  * Targ_NewGN  --
 /*-
  *-----------------------------------------------------------------------
  * Targ_NewGN  --


@@ -111,8 +101,8 @@ Targ_NewGN (name)
 {
     register GNode *gn;
 
 {
     register GNode *gn;
 

-    gn = (GNode *) malloc (sizeof (GNode));
-    gn->name = Str_New (name);
+    gn = (GNode *) emalloc (sizeof (GNode));
+    gn->name = strdup (name);

     gn->path = (char *) 0;
     if (name[0] == '-' && name[1] == 'l') {
        gn->type = OP_LIB;
     gn->path = (char *) 0;
     if (name[0] == '-' && name[1] == 'l') {
        gn->type = OP_LIB;


@@ -135,7 +125,7 @@ Targ_NewGN (name)
 
     return (gn);
 }
 
     return (gn);
 }

-\f
+

 /*-
  *-----------------------------------------------------------------------
  * Targ_FindNode  --
 /*-
  *-----------------------------------------------------------------------
  * Targ_FindNode  --


@@ -179,7 +169,7 @@ Targ_FindNode (name, flags)
        return ((GNode *) Hash_GetValue (he));
     }
 }
        return ((GNode *) Hash_GetValue (he));
     }
 }

-\f
+

 /*-
  *-----------------------------------------------------------------------
  * Targ_FindList --
 /*-
  *-----------------------------------------------------------------------
  * Targ_FindList --


@@ -231,7 +221,7 @@ Targ_FindList (names, flags)
     Lst_Close (names);
     return (nodes);
 }
     Lst_Close (names);
     return (nodes);
 }

-\f
+

 /*-
  *-----------------------------------------------------------------------
  * Targ_Ignore  --
 /*-
  *-----------------------------------------------------------------------
  * Targ_Ignore  --


@@ -254,7 +244,7 @@ Targ_Ignore (gn)
        return (FALSE);
     }
 }
        return (FALSE);
     }
 }

-\f
+

 /*-
  *-----------------------------------------------------------------------
  * Targ_Silent  --
 /*-
  *-----------------------------------------------------------------------
  * Targ_Silent  --


@@ -277,7 +267,7 @@ Targ_Silent (gn)
        return (FALSE);
     }
 }
        return (FALSE);
     }
 }

-\f
+

 /*-
  *-----------------------------------------------------------------------
  * Targ_Precious --
 /*-
  *-----------------------------------------------------------------------
  * Targ_Precious --


@@ -300,7 +290,7 @@ Targ_Precious (gn)
        return (FALSE);
     }
 }
        return (FALSE);
     }
 }

-\f
+

 /******************* DEBUG INFO PRINTING ****************/
 
 static GNode     *mainTarg;    /* the main target, as set by Targ_SetMain */
 /******************* DEBUG INFO PRINTING ****************/
 
 static GNode     *mainTarg;    /* the main target, as set by Targ_SetMain */


@@ -418,7 +408,7 @@ Targ_PrintType (type)
        type &= ~tbit;
 
        switch(tbit) {
        type &= ~tbit;
 
        switch(tbit) {

-           PRINTBIT(DONTCARE);
+           PRINTBIT(OPTIONAL);

            PRINTBIT(USE);
            PRINTBIT(EXEC);
            PRINTBIT(IGNORE);
            PRINTBIT(USE);
            PRINTBIT(EXEC);
            PRINTBIT(IGNORE);


@@ -426,13 +416,9 @@ Targ_PrintType (type)
            PRINTBIT(SILENT);
            PRINTBIT(MAKE);
            PRINTBIT(JOIN);
            PRINTBIT(SILENT);
            PRINTBIT(MAKE);
            PRINTBIT(JOIN);

-           PRINTBIT(EXPORT);
-           PRINTBIT(NOEXPORT);
-           PRINTBIT(EXPORTSAME);

            PRINTBIT(INVISIBLE);
            PRINTBIT(NOTMAIN);
            PRINTDBIT(LIB);
            PRINTBIT(INVISIBLE);
            PRINTBIT(NOTMAIN);
            PRINTDBIT(LIB);

-           PRINTBIT(M68020);

            /*XXX: MEMBER is defined, so CONCAT(OP_,MEMBER) gives OP_"%" */
            case OP_MEMBER: if (DEBUG(TARG)) printf(".MEMBER "); break;
            PRINTDBIT(ARCHV);
            /*XXX: MEMBER is defined, so CONCAT(OP_,MEMBER) gives OP_"%" */
            case OP_MEMBER: if (DEBUG(TARG)) printf(".MEMBER "); break;
            PRINTDBIT(ARCHV);


@@ -512,7 +498,7 @@ TargPrintNode (gn, pass)
     }
     return (0);
 }
     }
     return (0);
 }

-\f
+

 /*-
  *-----------------------------------------------------------------------
  * TargPrintOnlySrc --
 /*-
  *-----------------------------------------------------------------------
  * TargPrintOnlySrc --


@@ -536,7 +522,7 @@ TargPrintOnlySrc(gn)
     }
     return (0);
 }
     }
     return (0);
 }

-\f
+

 /*-
  *-----------------------------------------------------------------------
  * Targ_PrintGraph --
 /*-
  *-----------------------------------------------------------------------
  * Targ_PrintGraph --