Module Name: src
Committed By: rillig
Date: Sun Nov 8 08:53:22 UTC 2020
Modified Files:
src/usr.bin/make: main.c make.c util.c
Log Message:
make(1): use common indentation style for else
To generate a diff of this commit:
cvs rdiff -u -r1.443 -r1.444 src/usr.bin/make/main.c
cvs rdiff -u -r1.190 -r1.191 src/usr.bin/make/make.c
cvs rdiff -u -r1.66 -r1.67 src/usr.bin/make/util.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.443 src/usr.bin/make/main.c:1.444
--- src/usr.bin/make/main.c:1.443 Sun Nov 8 02:56:43 2020
+++ src/usr.bin/make/main.c Sun Nov 8 08:53:22 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.443 2020/11/08 02:56:43 rillig Exp $ */
+/* $NetBSD: main.c,v 1.444 2020/11/08 08:53:22 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -109,7 +109,7 @@
#include "trace.h"
/* "@(#)main.c 8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: main.c,v 1.443 2020/11/08 02:56:43 rillig Exp $");
+MAKE_RCSID("$NetBSD: main.c,v 1.444 2020/11/08 08:53:22 rillig Exp $");
#if defined(MAKE_NATIVE) && !defined(lint)
__COPYRIGHT("@(#) Copyright (c) 1988, 1989, 1990, 1993 "
"The Regents of the University of California. "
@@ -258,12 +258,10 @@ parse_debug_options(const char *argvalue
if (modules[1] == '1') {
opts.debug |= DEBUG_GRAPH1;
++modules;
- }
- else if (modules[1] == '2') {
+ } else if (modules[1] == '2') {
opts.debug |= DEBUG_GRAPH2;
++modules;
- }
- else if (modules[1] == '3') {
+ } else if (modules[1] == '3') {
opts.debug |= DEBUG_GRAPH3;
++modules;
}
Index: src/usr.bin/make/make.c
diff -u src/usr.bin/make/make.c:1.190 src/usr.bin/make/make.c:1.191
--- src/usr.bin/make/make.c:1.190 Sun Nov 8 08:33:07 2020
+++ src/usr.bin/make/make.c Sun Nov 8 08:53:22 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: make.c,v 1.190 2020/11/08 08:33:07 rillig Exp $ */
+/* $NetBSD: make.c,v 1.191 2020/11/08 08:53:22 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -108,7 +108,7 @@
#include "job.h"
/* "@(#)make.c 8.1 (Berkeley) 6/6/93" */
-MAKE_RCSID("$NetBSD: make.c,v 1.190 2020/11/08 08:33:07 rillig Exp $");
+MAKE_RCSID("$NetBSD: make.c,v 1.191 2020/11/08 08:53:22 rillig Exp $");
/* Sequence # to detect recursion. */
static unsigned int checked = 1;
@@ -550,8 +550,7 @@ Make_Recheck(GNode *gn)
DEBUG2(MAKE, " recheck(%s): update time from %s to now\n",
gn->name, Targ_FmtTime(gn->mtime));
gn->mtime = now;
- }
- else {
+ } else {
DEBUG2(MAKE, " recheck(%s): current update time: %s\n",
gn->name, Targ_FmtTime(gn->mtime));
}
Index: src/usr.bin/make/util.c
diff -u src/usr.bin/make/util.c:1.66 src/usr.bin/make/util.c:1.67
--- src/usr.bin/make/util.c:1.66 Sat Nov 7 22:29:58 2020
+++ src/usr.bin/make/util.c Sun Nov 8 08:53:22 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: util.c,v 1.66 2020/11/07 22:29:58 rillig Exp $ */
+/* $NetBSD: util.c,v 1.67 2020/11/08 08:53:22 rillig Exp $ */
/*
* Missing stuff from OS's
@@ -15,7 +15,7 @@
#include "make.h"
-MAKE_RCSID("$NetBSD: util.c,v 1.66 2020/11/07 22:29:58 rillig Exp $");
+MAKE_RCSID("$NetBSD: util.c,v 1.67 2020/11/08 08:53:22 rillig Exp $");
#if !defined(MAKE_NATIVE) && !defined(HAVE_STRERROR)
extern int errno, sys_nerr;
@@ -28,8 +28,7 @@ strerror(int e)
if (e < 0 || e >= sys_nerr) {
snprintf(buf, sizeof buf, "Unknown error %d", e);
return buf;
- }
- else
+ } else
return sys_errlist[e];
}
#endif
@@ -291,8 +290,7 @@ getwd(char *pathname)
for (d = readdir(dp); d != NULL; d = readdir(dp))
if (d->d_fileno == st_cur.st_ino)
break;
- }
- else {
+ } else {
/*
* Parent has a different device. This is a mount point so we
* need to stat every member
