[src/trunk]: src/usr.bin/make make(1): replace Lst_Open in Suff_DoPaths with ...

[rillig <rillig%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/5a86befb8ed4
branches:  trunk
changeset: 977206:5a86befb8ed4
user:      rillig <rillig%NetBSD.org@localhost>
date:      Sun Oct 18 14:09:39 2020 +0000

description:
make(1): replace Lst_Open in Suff_DoPaths with simple iteration

Since sufflist is not modified during iteration, there is no need for
the extra complexity of Lst_Open.

diffstat:

 usr.bin/make/suff.c |  12 ++++--------
 1 files changed, 4 insertions(+), 8 deletions(-)

diffs (48 lines):

diff -r d14e7bf4e630 -r 5a86befb8ed4 usr.bin/make/suff.c
--- a/usr.bin/make/suff.c       Sun Oct 18 14:00:08 2020 +0000
+++ b/usr.bin/make/suff.c       Sun Oct 18 14:09:39 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: suff.c,v 1.180 2020/10/18 13:02:10 rillig Exp $        */
+/*     $NetBSD: suff.c,v 1.181 2020/10/18 14:09:39 rillig Exp $        */
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -129,7 +129,7 @@
 #include "dir.h"
 
 /*     "@(#)suff.c     8.4 (Berkeley) 3/21/94" */
-MAKE_RCSID("$NetBSD: suff.c,v 1.180 2020/10/18 13:02:10 rillig Exp $");
+MAKE_RCSID("$NetBSD: suff.c,v 1.181 2020/10/18 14:09:39 rillig Exp $");
 
 #define SUFF_DEBUG0(text) DEBUG0(SUFF, text)
 #define SUFF_DEBUG1(fmt, arg1) DEBUG1(SUFF, fmt, arg1)
@@ -816,19 +816,16 @@
 void
 Suff_DoPaths(void)
 {
-    Suff *s;
     SuffListNode *ln;
     char *ptr;
     SearchPath *inIncludes; /* Cumulative .INCLUDES path */
     SearchPath *inLibs;            /* Cumulative .LIBS path */
 
-
     inIncludes = Lst_New();
     inLibs = Lst_New();
 
-    Lst_Open(sufflist);
-    while ((ln = Lst_Next(sufflist)) != NULL) {
-       s = LstNode_Datum(ln);
+    for (ln = sufflist->first; ln != NULL; ln = ln->next) {
+       Suff *s = LstNode_Datum(ln);
        if (!Lst_IsEmpty(s->searchPath)) {
 #ifdef INCLUDES
            if (s->flags & SUFF_INCLUDE) {
@@ -846,7 +843,6 @@
            s->searchPath = Lst_Copy(dirSearchPath, Dir_CopyDir);
        }
     }
-    Lst_Close(sufflist);
 
     Var_Set(".INCLUDES", ptr = Dir_MakeFlags("-I", inIncludes), VAR_GLOBAL);
     free(ptr);