Sat Sep 26 17:02:11 2020 UTC ()

make(1): inline Lst_ForEach in Targ_PrintGraph


(rillig)

diff -r1.99 -r1.100 src/usr.bin/make/targ.c

--- src/usr.bin/make/targ.c 2020/09/26 16:55:58	1.99
+++ src/usr.bin/make/targ.c 2020/09/26 17:02:11	1.100

 @@ -1,14 +1,14 @@
-/*	$NetBSD: targ.c,v 1.99 2020/09/26 16:55:58 rillig Exp $	*/
+/*	$NetBSD: targ.c,v 1.100 2020/09/26 17:02:11 rillig Exp $	*/
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Adam de Boor.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -111,27 +111,27 @@
  * Debugging:
  *	Targ_PrintGraph	    	Print out the entire graphm all variables
  *	    	  	    	and statistics for the directory cache. Should
  *	    	  	    	print something for suffixes, too, but...
  */
 #include	  <stdio.h>
 #include	  <time.h>
 #include	  "make.h"
 #include	  "dir.h"
 /*	"@(#)targ.c	8.2 (Berkeley) 3/19/94"	*/
-MAKE_RCSID("$NetBSD: targ.c,v 1.99 2020/09/26 16:55:58 rillig Exp $");
+MAKE_RCSID("$NetBSD: targ.c,v 1.100 2020/09/26 17:02:11 rillig Exp $");
 static GNodeList *allTargets;	/* the list of all targets found so far */
 #ifdef CLEANUP
 static GNodeList *allGNs;	/* List of all the GNodes */
 #endif
 static Hash_Table targets;	/* a hash table of same */
 #ifdef CLEANUP
 static void TargFreeGN(void *);
 #endif
 void
 Targ_Init(void)
 @@ -501,54 +501,57 @@ PrintNode(void *gnp, void *passp)
 /* Print the contents of a node. */
 void
 Targ_PrintNode(GNode *gn, int pass)
+{
     PrintNode(gn, &pass);
+}
 void
 Targ_PrintNodes(GNodeList *gnodes, int pass)
+{
     Lst_ForEach(gnodes, PrintNode, &pass);
+}
-/* Print only those targets that are just a source.
+/* Print only those targets that are just a source. */
  * The name of each file is printed, preceded by #\t. */
 static void
-TargPrintOnlySrc(void *gnp, void *dummy MAKE_ATTR_UNUSED)
+PrintOnlySources(void)
+{
-    GNode   	  *gn = (GNode *)gnp;
+    GNodeListNode *ln;
     if (!OP_NOP(gn->type))
 	return;
-    fprintf(debug_file, "#\t%s [%s]",
+    for (ln = allTargets->first; ln != NULL; ln = ln->next) {
-	    gn->name, gn->path ? gn->path : gn->name);
+	GNode *gn = ln->datum;
-    Targ_PrintType(gn->type);
+	if (!OP_NOP(gn->type))
-    fprintf(debug_file, "\n");
+	    continue;
 	fprintf(debug_file, "#\t%s [%s]",
 		gn->name, gn->path ? gn->path : gn->name);
 	Targ_PrintType(gn->type);
 	fprintf(debug_file, "\n");
+    }
+}
 /* Input:
  *	pass		1 => before processing
  *			2 => after processing
  *			3 => after processing, an error occurred
  */
 void
 Targ_PrintGraph(int pass)
+{
     fprintf(debug_file, "#*** Input graph:\n");
-    Lst_ForEach(allTargets, PrintNode, &pass);
+    Targ_PrintNodes(allTargets, pass);
     fprintf(debug_file, "\n\n");
     fprintf(debug_file, "#\n#   Files that are only sources:\n");
-    Lst_ForEach(allTargets, TargPrintOnlySrc, NULL);
+    PrintOnlySources();
     fprintf(debug_file, "#*** Global Variables:\n");
     Var_Dump(VAR_GLOBAL);
     fprintf(debug_file, "#*** Command-line Variables:\n");
     Var_Dump(VAR_CMD);
     fprintf(debug_file, "\n");
     Dir_PrintDirectories();
     fprintf(debug_file, "\n");
     Suff_PrintAll();
+}
 /* Propagate some type information to cohort nodes (those from the ::
  * dependency operator).
+ *