Module Name: src
Committed By: rillig
Date: Sat Dec 5 18:15:40 UTC 2020
Modified Files:
src/usr.bin/make: arch.c cond.c job.c parse.c var.c
Log Message:
make(1): remove redundant assignments
To generate a diff of this commit:
cvs rdiff -u -r1.185 -r1.186 src/usr.bin/make/arch.c
cvs rdiff -u -r1.220 -r1.221 src/usr.bin/make/cond.c
cvs rdiff -u -r1.336 -r1.337 src/usr.bin/make/job.c
cvs rdiff -u -r1.464 -r1.465 src/usr.bin/make/parse.c
cvs rdiff -u -r1.705 -r1.706 src/usr.bin/make/var.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/arch.c
diff -u src/usr.bin/make/arch.c:1.185 src/usr.bin/make/arch.c:1.186
--- src/usr.bin/make/arch.c:1.185 Sat Dec 5 17:17:37 2020
+++ src/usr.bin/make/arch.c Sat Dec 5 18:15:40 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: arch.c,v 1.185 2020/12/05 17:17:37 rillig Exp $ */
+/* $NetBSD: arch.c,v 1.186 2020/12/05 18:15:40 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -125,7 +125,7 @@
#include "config.h"
/* "@(#)arch.c 8.2 (Berkeley) 1/2/94" */
-MAKE_RCSID("$NetBSD: arch.c,v 1.185 2020/12/05 17:17:37 rillig Exp $");
+MAKE_RCSID("$NetBSD: arch.c,v 1.186 2020/12/05 18:15:40 rillig Exp $");
typedef struct List ArchList;
typedef struct ListNode ArchListNode;
@@ -444,7 +444,6 @@ ArchStatMember(const char *archive, cons
size_t len = strlen(member);
if (len > AR_MAX_NAME_LEN) {
- len = AR_MAX_NAME_LEN;
snprintf(copy, sizeof copy, "%s", member);
hdr = HashTable_FindValue(&ar->members, copy);
}
Index: src/usr.bin/make/cond.c
diff -u src/usr.bin/make/cond.c:1.220 src/usr.bin/make/cond.c:1.221
--- src/usr.bin/make/cond.c:1.220 Sun Nov 29 01:40:26 2020
+++ src/usr.bin/make/cond.c Sat Dec 5 18:15:40 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: cond.c,v 1.220 2020/11/29 01:40:26 rillig Exp $ */
+/* $NetBSD: cond.c,v 1.221 2020/12/05 18:15:40 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -94,7 +94,7 @@
#include "dir.h"
/* "@(#)cond.c 8.2 (Berkeley) 1/2/94" */
-MAKE_RCSID("$NetBSD: cond.c,v 1.220 2020/11/29 01:40:26 rillig Exp $");
+MAKE_RCSID("$NetBSD: cond.c,v 1.221 2020/12/05 18:15:40 rillig Exp $");
/*
* The parsing of conditional expressions is based on this grammar:
@@ -800,7 +800,7 @@ CondParser_LeafToken(CondParser *par, Bo
Token t;
char *arg = NULL;
size_t arglen;
- const char *cp = par->p;
+ const char *cp;
const char *cp1;
if (CondParser_Func(par, doEval, &t))
Index: src/usr.bin/make/job.c
diff -u src/usr.bin/make/job.c:1.336 src/usr.bin/make/job.c:1.337
--- src/usr.bin/make/job.c:1.336 Sat Dec 5 17:44:22 2020
+++ src/usr.bin/make/job.c Sat Dec 5 18:15:40 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: job.c,v 1.336 2020/12/05 17:44:22 rillig Exp $ */
+/* $NetBSD: job.c,v 1.337 2020/12/05 18:15:40 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -143,7 +143,7 @@
#include "trace.h"
/* "@(#)job.c 8.2 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: job.c,v 1.336 2020/12/05 17:44:22 rillig Exp $");
+MAKE_RCSID("$NetBSD: job.c,v 1.337 2020/12/05 18:15:40 rillig Exp $");
/* A shell defines how the commands are run. All commands for a target are
* written into a single file, which is then given to the shell to execute
@@ -1689,7 +1689,7 @@ JobOutput(char *cp, char *endp)
static void
JobDoOutput(Job *job, Boolean finish)
{
- Boolean gotNL = FALSE; /* true if got a newline */
+ Boolean gotNL; /* true if got a newline */
Boolean fbuf; /* true if our buffer filled up */
size_t nr; /* number of bytes read */
size_t i; /* auxiliary index into outBuf */
Index: src/usr.bin/make/parse.c
diff -u src/usr.bin/make/parse.c:1.464 src/usr.bin/make/parse.c:1.465
--- src/usr.bin/make/parse.c:1.464 Fri Dec 4 20:23:33 2020
+++ src/usr.bin/make/parse.c Sat Dec 5 18:15:40 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: parse.c,v 1.464 2020/12/04 20:23:33 rillig Exp $ */
+/* $NetBSD: parse.c,v 1.465 2020/12/05 18:15:40 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -117,7 +117,7 @@
#include "pathnames.h"
/* "@(#)parse.c 8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: parse.c,v 1.464 2020/12/04 20:23:33 rillig Exp $");
+MAKE_RCSID("$NetBSD: parse.c,v 1.465 2020/12/05 18:15:40 rillig Exp $");
/* types and constants */
@@ -1422,7 +1422,7 @@ ParseDoDependencyTargets(char **inout_cp
SearchPathList **inout_paths,
StringList *curTargs)
{
- char *cp = *inout_cp;
+ char *cp;
char *tgt = *inout_line;
char savec;
const char *p;
@@ -1876,7 +1876,7 @@ static void
VarAssign_EvalSubst(const char *name, const char *uvalue, GNode *ctxt,
const char **out_avalue, void **out_avalue_freeIt)
{
- const char *avalue = uvalue;
+ const char *avalue;
char *evalue;
Boolean savedPreserveUndefined = preserveUndefined;
Index: src/usr.bin/make/var.c
diff -u src/usr.bin/make/var.c:1.705 src/usr.bin/make/var.c:1.706
--- src/usr.bin/make/var.c:1.705 Sat Dec 5 15:31:18 2020
+++ src/usr.bin/make/var.c Sat Dec 5 18:15:40 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: var.c,v 1.705 2020/12/05 15:31:18 rillig Exp $ */
+/* $NetBSD: var.c,v 1.706 2020/12/05 18:15:40 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -130,7 +130,7 @@
#include "metachar.h"
/* "@(#)var.c 8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: var.c,v 1.705 2020/12/05 15:31:18 rillig Exp $");
+MAKE_RCSID("$NetBSD: var.c,v 1.706 2020/12/05 18:15:40 rillig Exp $");
#define VAR_DEBUG1(fmt, arg1) DEBUG1(VAR, fmt, arg1)
#define VAR_DEBUG2(fmt, arg1, arg2) DEBUG2(VAR, fmt, arg1, arg2)
@@ -2492,7 +2492,6 @@ ApplyModifier_Match(const char **pp, App
*dst = *src;
}
*dst = '\0';
- endpat = dst;
} else {
pattern = bmake_strsedup(mod + 1, endpat);
}
