Module Name:    src
Committed By:   rillig
Date:           Sat Nov 14 19:36:31 UTC 2020

Modified Files:
        src/usr.bin/make: dir.c

Log Message:
make(1): inline local variable in Dir_UpdateMTime

Now that the signature of cached_stats is cleaned up, the line is short
enough to contain the whole condition.


To generate a diff of this commit:
cvs rdiff -u -r1.208 -r1.209 src/usr.bin/make/dir.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/usr.bin/make/dir.c
diff -u src/usr.bin/make/dir.c:1.208 src/usr.bin/make/dir.c:1.209
--- src/usr.bin/make/dir.c:1.208	Sat Nov 14 19:24:24 2020
+++ src/usr.bin/make/dir.c	Sat Nov 14 19:36:31 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: dir.c,v 1.208 2020/11/14 19:24:24 rillig Exp $	*/
+/*	$NetBSD: dir.c,v 1.209 2020/11/14 19:36:31 rillig Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -134,7 +134,7 @@
 #include "job.h"
 
 /*	"@(#)dir.c	8.2 (Berkeley) 1/2/94"	*/
-MAKE_RCSID("$NetBSD: dir.c,v 1.208 2020/11/14 19:24:24 rillig Exp $");
+MAKE_RCSID("$NetBSD: dir.c,v 1.209 2020/11/14 19:36:31 rillig Exp $");
 
 #define DIR_DEBUG0(text) DEBUG0(DIR, text)
 #define DIR_DEBUG1(fmt, arg1) DEBUG1(DIR, fmt, arg1)
@@ -1279,7 +1279,6 @@ Dir_UpdateMTime(GNode *gn, Boolean reche
 {
     char *fullName;
     struct cached_stat cst;
-    CachedStatsFlags flags;
 
     if (gn->type & OP_ARCHV) {
 	Arch_UpdateMTime(gn);
@@ -1334,8 +1333,7 @@ Dir_UpdateMTime(GNode *gn, Boolean reche
     if (fullName == NULL)
 	fullName = bmake_strdup(gn->name);
 
-    flags = recheck ? CST_UPDATE : CST_NONE;
-    if (cached_stats(fullName, &cst, flags) < 0) {
+    if (cached_stats(fullName, &cst, recheck ? CST_UPDATE : CST_NONE) < 0) {
 	if (gn->type & OP_MEMBER) {
 	    if (fullName != gn->path)
 		free(fullName);

Reply via email to