Changeset 24 for branches/FREEBSD/src/kmk/targ.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/targ.c (modified) (32 diffs)

branches/FREEBSD/src/kmk/targ.c

@@ -35 +35 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * @(#)targ.c   8.2 (Berkeley) 3/19/94
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/usr.bin/make/targ.c,v 1.25 2002/10/09 03:42:10 jmallett Exp $");
+ */
+
+#ifndef lint
+#if 0
+static char sccsid[] = "@(#)targ.c      8.2 (Berkeley) 3/19/94";
+#else
+static const char rcsid[] =
+  "$FreeBSD: src/usr.bin/make/targ.c,v 1.10 1999/09/11 13:08:02 hoek Exp $";
+#endif
+#endif /* not lint */
 
 /*-
@@ -93 +97 @@
 static Hash_Table targets;      /* a hash table of same */
 
-#define HTSIZE  191             /* initial size of hash table */
-
-static int TargPrintOnlySrc(void *, void *);
-static int TargPrintName(void *, void *);
-static int TargPrintNode(void *, void *);
-static void TargFreeGN(void *);
+#define HTSIZE  191             /* initial size of hash table */
+
+static int TargPrintOnlySrc __P((ClientData, ClientData));
+static int TargPrintName __P((ClientData, ClientData));
+static int TargPrintNode __P((ClientData, ClientData));
+static void TargFreeGN __P((ClientData));
 
 /*-
@@ -113 +117 @@
  */
 void
-Targ_Init (void)
+Targ_Init ()
 {
     allTargets = Lst_Init (FALSE);
@@ -132 +136 @@
  */
 void
-Targ_End (void)
+Targ_End ()
 {
     Lst_Destroy(allTargets, NOFREE);
@@ -154 +158 @@
  */
 GNode *
-Targ_NewGN (char *name)
-{
-    GNode *gn;
+Targ_NewGN (name)
+    char           *name;       /* the name to stick in the new node */
+{
+    register GNode *gn;
 
     gn = (GNode *) emalloc (sizeof (GNode));
@@ -184 +189 @@
     if (allGNs == NULL)
         allGNs = Lst_Init(FALSE);
-    Lst_AtEnd(allGNs, (void *) gn);
+    Lst_AtEnd(allGNs, (ClientData) gn);
 
     return (gn);
@@ -202 +207 @@
  */
 static void
-TargFreeGN (void *gnp)
+TargFreeGN (gnp)
+    ClientData gnp;
 {
     GNode *gn = (GNode *) gnp;
@@ -218 +224 @@
     Lst_Destroy(gn->context, NOFREE);
     Lst_Destroy(gn->commands, NOFREE);
-    free(gn);
+    free((Address)gn);
 }
 
@@ -228 +234 @@
  *
  * Results:
- *      The node in the list if it was. If it wasn't, return NULL of
+ *      The node in the list if it was. If it wasn't, return NILGNODE of
  *      flags was TARG_NOCREATE or the newly created and initialized node
  *      if it was TARG_CREATE
@@ -237 +243 @@
  */
 GNode *
-Targ_FindNode (char *name, int flags)
+Targ_FindNode (name, flags)
+    char           *name;       /* the name to find */
+    int             flags;      /* flags governing events when target not
+                                 * found */
 {
     GNode         *gn;        /* node in that element */
@@ -250 +259 @@
             gn = Targ_NewGN (name);
             Hash_SetValue (he, gn);
-            (void) Lst_AtEnd (allTargets, (void *)gn);
+            (void) Lst_AtEnd (allTargets, (ClientData)gn);
         }
     } else {
@@ -257 +266 @@
 
     if (he == (Hash_Entry *) NULL) {
-        return (NULL);
+        return (NILGNODE);
     } else {
         return ((GNode *) Hash_GetValue (he));
@@ -279 +288 @@
  */
 Lst
-Targ_FindList (Lst names, int flags)
+Targ_FindList (names, flags)
+    Lst            names;       /* list of names to find */
+    int            flags;       /* flags used if no node is found for a given
+                                 * name */
 {
     Lst            nodes;       /* result list */
-    LstNode        ln;          /* name list element */
-    GNode          *gn;         /* node in tLn */
-    char           *name;
+    register LstNode  ln;               /* name list element */
+    register GNode *gn;         /* node in tLn */
+    char          *name;
 
     nodes = Lst_Init (FALSE);
@@ -291 +303 @@
         return (nodes);
     }
-    while ((ln = Lst_Next (names)) != NULL) {
+    while ((ln = Lst_Next (names)) != NILLNODE) {
         name = (char *)Lst_Datum(ln);
         gn = Targ_FindNode (name, flags);
-        if (gn != NULL) {
+        if (gn != NILGNODE) {
             /*
              * Note: Lst_AtEnd must come before the Lst_Concat so the nodes
@@ -300 +312 @@
              * encountered in the makefile.
              */
-            (void) Lst_AtEnd (nodes, (void *)gn);
+            (void) Lst_AtEnd (nodes, (ClientData)gn);
             if (gn->type & OP_DOUBLEDEP) {
                 (void)Lst_Concat (nodes, gn->cohorts, LST_CONCNEW);
@@ -325 +337 @@
  */
 Boolean
-Targ_Ignore (GNode *gn)
+Targ_Ignore (gn)
+    GNode          *gn;         /* node to check for */
 {
     if (ignoreErrors || gn->type & OP_IGNORE) {
@@ -347 +360 @@
  */
 Boolean
-Targ_Silent (GNode *gn)
+Targ_Silent (gn)
+    GNode          *gn;         /* node to check for */
 {
     if (beSilent || gn->type & OP_SILENT) {
@@ -369 +383 @@
  */
 Boolean
-Targ_Precious (GNode *gn)
+Targ_Precious (gn)
+    GNode          *gn;         /* the node to check */
 {
     if (allPrecious || (gn->type & (OP_PRECIOUS|OP_DOUBLEDEP))) {
@@ -395 +410 @@
  */
 void
-Targ_SetMain (GNode *gn)
+Targ_SetMain (gn)
+    GNode   *gn;        /* The main target we'll create */
 {
     mainTarg = gn;
@@ -401 +417 @@
 
 static int
-TargPrintName (void *gnp, void *ppath)
+TargPrintName (gnp, ppath)
+    ClientData     gnp;
+    ClientData      ppath;
 {
     GNode *gn = (GNode *) gnp;
@@ -420 +438 @@
 
 int
-Targ_PrintCmd (void *cmd, void *dummy __unused)
+Targ_PrintCmd (cmd, dummy)
+    ClientData cmd;
+    ClientData dummy;
 {
     printf ("\t%s\n", (char *) cmd);
-    return (0);
+    return (dummy ? 0 : 0);
 }
 
@@ -441 +461 @@
  */
 char *
-Targ_FmtTime (time_t modtime)
+Targ_FmtTime (time)
+    time_t    time;
 {
     struct tm           *parts;
     static char         buf[128];
 
-    parts = localtime(&modtime);
-
-    strftime(buf, sizeof buf, "%H:%M:%S %b %d, %Y", parts);
+    parts = localtime(&time);
+
+    strftime(buf, sizeof buf, "%k:%M:%S %b %d, %Y", parts);
     buf[sizeof(buf) - 1] = '\0';
     return(buf);
@@ -466 +487 @@
  */
 void
-Targ_PrintType (int type)
-{
-    int    tbit;
-
-#define PRINTBIT(attr)  case CONCAT(OP_,attr): printf("." #attr " "); break
-#define PRINTDBIT(attr) case CONCAT(OP_,attr): DEBUGF(TARG, ("." #attr " ")); break
+Targ_PrintType (type)
+    register int    type;
+{
+    register int    tbit;
+
+#ifdef __STDC__
+#define PRINTBIT(attr)  case CONCAT(OP_,attr): printf("." #attr " "); break
+#define PRINTDBIT(attr) case CONCAT(OP_,attr): if (DEBUG(TARG)) printf("." #attr " "); break
+#else
+#define PRINTBIT(attr)  case CONCAT(OP_,attr): printf(".attr "); break
+#define PRINTDBIT(attr) case CONCAT(OP_,attr): if (DEBUG(TARG)) printf(".attr "); break
+#endif /* __STDC__ */
 
     type &= ~OP_OPMASK;
@@ -492 +519 @@
             PRINTDBIT(LIB);
             /*XXX: MEMBER is defined, so CONCAT(OP_,MEMBER) gives OP_"%" */
-            case OP_MEMBER: DEBUGF(TARG, (".MEMBER ")); break;
+            case OP_MEMBER: if (DEBUG(TARG)) printf(".MEMBER "); break;
             PRINTDBIT(ARCHV);
         }
@@ -505 +532 @@
  */
 static int
-TargPrintNode (void *gnp, void *passp)
+TargPrintNode (gnp, passp)
+    ClientData   gnp;
+    ClientData   passp;
 {
     GNode         *gn = (GNode *) gnp;
@@ -540 +569 @@
             if (!Lst_IsEmpty (gn->iParents)) {
                 printf("# implicit parents: ");
-                Lst_ForEach (gn->iParents, TargPrintName, (void *)0);
+                Lst_ForEach (gn->iParents, TargPrintName, (ClientData)0);
                 fputc ('\n', stdout);
             }
@@ -546 +575 @@
         if (!Lst_IsEmpty (gn->parents)) {
             printf("# parents: ");
-            Lst_ForEach (gn->parents, TargPrintName, (void *)0);
+            Lst_ForEach (gn->parents, TargPrintName, (ClientData)0);
             fputc ('\n', stdout);
         }
@@ -558 +587 @@
             case OP_DOUBLEDEP:
                 printf(":: "); break;
-            default:
-                break;
         }
         Targ_PrintType (gn->type);
-        Lst_ForEach (gn->children, TargPrintName, (void *)0);
+        Lst_ForEach (gn->children, TargPrintName, (ClientData)0);
         fputc ('\n', stdout);
-        Lst_ForEach (gn->commands, Targ_PrintCmd, (void *)0);
+        Lst_ForEach (gn->commands, Targ_PrintCmd, (ClientData)0);
         printf("\n\n");
         if (gn->type & OP_DOUBLEDEP) {
-            Lst_ForEach (gn->cohorts, TargPrintNode, (void *)&pass);
+            Lst_ForEach (gn->cohorts, TargPrintNode, (ClientData)&pass);
         }
     }
@@ -582 +609 @@
  *
  * Side Effects:
- *      The name of each file is printed preceded by #\t
+ *      The name of each file is printed preceeded by #\t
  *
  *-----------------------------------------------------------------------
  */
 static int
-TargPrintOnlySrc(void *gnp, void *dummy __unused)
+TargPrintOnlySrc(gnp, dummy)
+    ClientData    gnp;
+    ClientData    dummy;
 {
     GNode         *gn = (GNode *) gnp;
@@ -593 +622 @@
         printf("#\t%s [%s]\n", gn->name, gn->path ? gn->path : gn->name);
 
-    return (0);
+    return (dummy ? 0 : 0);
 }
 
@@ -599 +628 @@
  *-----------------------------------------------------------------------
  * Targ_PrintGraph --
- *      Print the entire graph.
+ *      print the entire graph. heh heh
  *
  * Results:
@@ -609 +638 @@
  */
 void
-Targ_PrintGraph (int pass)
+Targ_PrintGraph (pass)
+    int     pass;       /* Which pass this is. 1 => no processing
+                         * 2 => processing done */
 {
     printf("#*** Input graph:\n");
-    Lst_ForEach (allTargets, TargPrintNode, (void *)&pass);
+    Lst_ForEach (allTargets, TargPrintNode, (ClientData)&pass);
     printf("\n\n");
     printf("#\n#   Files that are only sources:\n");
-    Lst_ForEach (allTargets, TargPrintOnlySrc, (void *) 0);
+    Lst_ForEach (allTargets, TargPrintOnlySrc, (ClientData) 0);
     printf("#*** Global Variables:\n");
     Var_Dump (VAR_GLOBAL);