Sun Nov 22 11:11:43 2020 UTC ()

make(1): fix type of local variable in FindDepsRegular

The compiler cannot check these since all lists and list nodes are
aliases to each other.

Maybe it's time to add type-generic lists to the code, to delegate these
checks to the compiler.


(rillig)

diff -r1.289 -r1.290 src/usr.bin/make/suff.c

--- src/usr.bin/make/suff.c 2020/11/22 10:27:56	1.289
+++ src/usr.bin/make/suff.c 2020/11/22 11:11:43	1.290

 @@ -1,14 +1,14 @@
-/*	$NetBSD: suff.c,v 1.289 2020/11/22 10:27:56 rillig Exp $	*/
+/*	$NetBSD: suff.c,v 1.290 2020/11/22 11:11:43 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.
 @@ -104,27 +104,27 @@
  *	Suff_FindDeps	Find implicit sources for and the location of
  *			a target based on its suffix. Returns the
  *			bottom-most node added to the graph or NULL
  *			if the target had no implicit sources.
+ *
  *	Suff_FindPath	Return the appropriate path to search in order to
  *			find the node.
  */
 #include "make.h"
 #include "dir.h"
 /*	"@(#)suff.c	8.4 (Berkeley) 3/21/94"	*/
-MAKE_RCSID("$NetBSD: suff.c,v 1.289 2020/11/22 10:27:56 rillig Exp $");
+MAKE_RCSID("$NetBSD: suff.c,v 1.290 2020/11/22 11:11:43 rillig Exp $");
 #define SUFF_DEBUG0(text) DEBUG0(SUFF, text)
 #define SUFF_DEBUG1(fmt, arg1) DEBUG1(SUFF, fmt, arg1)
 #define SUFF_DEBUG2(fmt, arg1, arg2) DEBUG2(SUFF, fmt, arg1, arg2)
 typedef List SuffixList;
 typedef ListNode SuffixListNode;
 typedef List CandidateList;
 typedef ListNode CandidateListNode;
 static SuffixList *sufflist;	/* List of suffixes */
 #ifdef CLEANUP
 @@ -1738,27 +1738,27 @@ FindDepsRegular(GNode *gn, CandidateList
+	}
+    }
     Var_Set(TARGET, GNode_Path(gn), gn);
     pref = targ != NULL ? targ->pref : gn->name;
     Var_Set(PREFIX, pref, gn);
     /*
      * Now we've got the important local variables set, expand any sources
      * that still contain variables or wildcards in their names.
      */
+    {
-	SuffixListNode *ln, *nln;
+	GNodeListNode *ln, *nln;
 	for (ln = gn->children->first; ln != NULL; ln = nln) {
 	    nln = ln->next;
 	    ExpandChildren(ln, gn);
+	}
+    }
     if (targ == NULL) {
 	SUFF_DEBUG1("\tNo valid suffix on %s\n", gn->name);
 sfnd_abort:
 	FindDepsRegularPath(gn, targ);
 	goto sfnd_return;
+    }