Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/usr.bin/make In Dir_FindFile() add a missing Lst_Close() and...



details:   https://anonhg.NetBSD.org/src/rev/06ca8b5e9923
branches:  trunk
changeset: 520842:06ca8b5e9923
user:      pk <pk%NetBSD.org@localhost>
date:      Fri Jan 18 19:18:23 2002 +0000

description:
In Dir_FindFile() add a missing Lst_Close() and move another one to the
proper place.

diffstat:

 usr.bin/make/dir.c |  9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diffs (50 lines):

diff -r e0e881975376 -r 06ca8b5e9923 usr.bin/make/dir.c
--- a/usr.bin/make/dir.c        Fri Jan 18 18:59:24 2002 +0000
+++ b/usr.bin/make/dir.c        Fri Jan 18 19:18:23 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: dir.c,v 1.28 2001/11/12 21:58:17 tv Exp $      */
+/*     $NetBSD: dir.c,v 1.29 2002/01/18 19:18:23 pk Exp $      */
 
 /*
  * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -39,14 +39,14 @@
  */
 
 #ifdef MAKE_BOOTSTRAP
-static char rcsid[] = "$NetBSD: dir.c,v 1.28 2001/11/12 21:58:17 tv Exp $";
+static char rcsid[] = "$NetBSD: dir.c,v 1.29 2002/01/18 19:18:23 pk Exp $";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)dir.c      8.2 (Berkeley) 1/2/94";
 #else
-__RCSID("$NetBSD: dir.c,v 1.28 2001/11/12 21:58:17 tv Exp $");
+__RCSID("$NetBSD: dir.c,v 1.29 2002/01/18 19:18:23 pk Exp $");
 #endif
 #endif /* not lint */
 #endif
@@ -1010,6 +1010,7 @@
                return NULL;
        }
     }
+    Lst_Close (path);
 
     if (lastDot && (file = DirFindDot(hasSlash, name, cp)) != NULL)
        return file;
@@ -1056,6 +1057,7 @@
                return file;
            }
        }
+       Lst_Close (path);
 
        if (lastDot && cur && (file = DirLookupSubdir(cur, name)) != NULL)
            return file;
@@ -1063,7 +1065,6 @@
        if (DEBUG(DIR)) {
            printf("failed. ");
        }
-       Lst_Close (path);
 
        if (checkedDot) {
            /*



Home | Main Index | Thread Index | Old Index