Module Name: src
Committed By: rillig
Date: Mon Feb 1 19:46:58 UTC 2021
Modified Files:
src/usr.bin/make: main.c str.c util.c var.c
Log Message:
make: replace pre-increment with post-increment or simple addition
The rest of the code already prefers post-increment if there is no
actual difference.
To generate a diff of this commit:
cvs rdiff -u -r1.522 -r1.523 src/usr.bin/make/main.c
cvs rdiff -u -r1.79 -r1.80 src/usr.bin/make/str.c
cvs rdiff -u -r1.73 -r1.74 src/usr.bin/make/util.c
cvs rdiff -u -r1.786 -r1.787 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/main.c
diff -u src/usr.bin/make/main.c:1.522 src/usr.bin/make/main.c:1.523
--- src/usr.bin/make/main.c:1.522 Mon Feb 1 19:43:07 2021
+++ src/usr.bin/make/main.c Mon Feb 1 19:46:58 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.522 2021/02/01 19:43:07 rillig Exp $ */
+/* $NetBSD: main.c,v 1.523 2021/02/01 19:46:58 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -111,7 +111,7 @@
#include "trace.h"
/* "@(#)main.c 8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: main.c,v 1.522 2021/02/01 19:43:07 rillig Exp $");
+MAKE_RCSID("$NetBSD: main.c,v 1.523 2021/02/01 19:46:58 rillig Exp $");
#if defined(MAKE_NATIVE) && !defined(lint)
__COPYRIGHT("@(#) Copyright (c) 1988, 1989, 1990, 1993 "
"The Regents of the University of California. "
@@ -244,7 +244,7 @@ MainParseArgDebug(const char *argvalue)
const char *modules;
DebugFlags debug = opts.debug;
- for (modules = argvalue; *modules != '\0'; ++modules) {
+ for (modules = argvalue; *modules != '\0'; modules++) {
switch (*modules) {
case '0': /* undocumented, only intended for tests */
debug = DEBUG_NONE;
@@ -652,7 +652,7 @@ rearg:
* perform them if so. Else take them to be targets and stuff them
* on the end of the "create" list.
*/
- for (; argc > 1; ++argv, --argc) {
+ for (; argc > 1; argv++, argc--) {
VarAssign var;
if (Parse_IsVar(argv[1], &var)) {
Parse_DoVar(&var, VAR_CMDLINE);
@@ -687,7 +687,7 @@ Main_ParseArgLine(const char *line)
if (line == NULL)
return;
/* XXX: don't use line as an iterator variable */
- for (; *line == ' '; ++line)
+ for (; *line == ' '; line++)
continue;
if (line[0] == '\0')
return;
Index: src/usr.bin/make/str.c
diff -u src/usr.bin/make/str.c:1.79 src/usr.bin/make/str.c:1.80
--- src/usr.bin/make/str.c:1.79 Tue Jan 19 20:51:46 2021
+++ src/usr.bin/make/str.c Mon Feb 1 19:46:58 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: str.c,v 1.79 2021/01/19 20:51:46 rillig Exp $ */
+/* $NetBSD: str.c,v 1.80 2021/02/01 19:46:58 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -71,7 +71,7 @@
#include "make.h"
/* "@(#)str.c 5.8 (Berkeley) 6/1/90" */
-MAKE_RCSID("$NetBSD: str.c,v 1.79 2021/01/19 20:51:46 rillig Exp $");
+MAKE_RCSID("$NetBSD: str.c,v 1.80 2021/02/01 19:46:58 rillig Exp $");
/* Return the concatenation of s1 and s2, freshly allocated. */
char *
@@ -156,7 +156,7 @@ Str_Words(const char *str, Boolean expan
inquote = '\0';
word_start = words_buf;
word_end = words_buf;
- for (str_p = str;; ++str_p) {
+ for (str_p = str;; str_p++) {
char ch = *str_p;
switch (ch) {
case '"':
Index: src/usr.bin/make/util.c
diff -u src/usr.bin/make/util.c:1.73 src/usr.bin/make/util.c:1.74
--- src/usr.bin/make/util.c:1.73 Wed Dec 30 10:03:16 2020
+++ src/usr.bin/make/util.c Mon Feb 1 19:46:58 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: util.c,v 1.73 2020/12/30 10:03:16 rillig Exp $ */
+/* $NetBSD: util.c,v 1.74 2021/02/01 19:46:58 rillig Exp $ */
/*
* Missing stuff from OS's
@@ -15,7 +15,7 @@
#include "make.h"
-MAKE_RCSID("$NetBSD: util.c,v 1.73 2020/12/30 10:03:16 rillig Exp $");
+MAKE_RCSID("$NetBSD: util.c,v 1.74 2021/02/01 19:46:58 rillig Exp $");
#if !defined(MAKE_NATIVE) && !defined(HAVE_STRERROR)
extern int errno, sys_nerr;
@@ -76,7 +76,7 @@ unsetenv(const char *name)
}
while (findenv(name, &offset)) { /* if set multiple times */
- for (p = &environ[offset];; ++p)
+ for (p = &environ[offset];; p++)
if (!(*p = *(p + 1)))
break;
}
@@ -124,7 +124,7 @@ setenv(const char *name, const char *val
environ = savedEnv;
environ[offset + 1] = NULL;
}
- for (cc = name; *cc && *cc != '='; ++cc) /* no `=' in name */
+ for (cc = name; *cc && *cc != '='; cc++) /* no `=' in name */
continue;
size = cc - name;
/* name + `=' + value */
Index: src/usr.bin/make/var.c
diff -u src/usr.bin/make/var.c:1.786 src/usr.bin/make/var.c:1.787
--- src/usr.bin/make/var.c:1.786 Sat Jan 30 21:25:10 2021
+++ src/usr.bin/make/var.c Mon Feb 1 19:46:58 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: var.c,v 1.786 2021/01/30 21:25:10 rillig Exp $ */
+/* $NetBSD: var.c,v 1.787 2021/02/01 19:46:58 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -131,7 +131,7 @@
#include "metachar.h"
/* "@(#)var.c 8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: var.c,v 1.786 2021/01/30 21:25:10 rillig Exp $");
+MAKE_RCSID("$NetBSD: var.c,v 1.787 2021/02/01 19:46:58 rillig Exp $");
typedef enum VarFlags {
VAR_NONE = 0,
@@ -2162,7 +2162,7 @@ ParseModifierPartSubst(
return VPR_ERR;
}
- *pp = ++p;
+ *pp = p + 1;
if (out_length != NULL)
*out_length = buf.len;
