Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/usr.bin/make make(1): fix indentation
details: https://anonhg.NetBSD.org/src/rev/655edcb32010
branches: trunk
changeset: 937628:655edcb32010
user: rillig <rillig%NetBSD.org@localhost>
date: Sat Aug 22 17:34:25 2020 +0000
description:
make(1): fix indentation
diffstat:
usr.bin/make/dir.c | 10 +++++-----
usr.bin/make/lst.c | 10 +++++-----
usr.bin/make/main.c | 8 ++++----
usr.bin/make/meta.c | 6 +++---
usr.bin/make/parse.c | 8 ++++----
usr.bin/make/var.c | 10 +++++-----
6 files changed, 26 insertions(+), 26 deletions(-)
diffs (220 lines):
diff -r 9a32aefeaa9d -r 655edcb32010 usr.bin/make/dir.c
--- a/usr.bin/make/dir.c Sat Aug 22 17:32:55 2020 +0000
+++ b/usr.bin/make/dir.c Sat Aug 22 17:34:25 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: dir.c,v 1.105 2020/08/22 15:55:22 rillig Exp $ */
+/* $NetBSD: dir.c,v 1.106 2020/08/22 17:34:25 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -70,14 +70,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: dir.c,v 1.105 2020/08/22 15:55:22 rillig Exp $";
+static char rcsid[] = "$NetBSD: dir.c,v 1.106 2020/08/22 17:34:25 rillig 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.105 2020/08/22 15:55:22 rillig Exp $");
+__RCSID("$NetBSD: dir.c,v 1.106 2020/08/22 17:34:25 rillig Exp $");
#endif
#endif /* not lint */
#endif
@@ -650,7 +650,7 @@
{
int nest = 0;
while (*p != '\0') {
- if (*p == '}' && nest == 0)
+ if (*p == '}' && nest == 0)
break;
if (*p == '{')
nest++;
@@ -668,7 +668,7 @@
{
int nest = 0;
while (*p != '\0') {
- if ((*p == '}' || *p == ',') && nest == 0)
+ if ((*p == '}' || *p == ',') && nest == 0)
break;
if (*p == '{')
nest++;
diff -r 9a32aefeaa9d -r 655edcb32010 usr.bin/make/lst.c
--- a/usr.bin/make/lst.c Sat Aug 22 17:32:55 2020 +0000
+++ b/usr.bin/make/lst.c Sat Aug 22 17:34:25 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: lst.c,v 1.30 2020/08/22 16:00:52 skrll Exp $ */
+/* $NetBSD: lst.c,v 1.31 2020/08/22 17:34:25 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -38,11 +38,11 @@
#include "make.h"
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: lst.c,v 1.30 2020/08/22 16:00:52 skrll Exp $";
+static char rcsid[] = "$NetBSD: lst.c,v 1.31 2020/08/22 17:34:25 rillig Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: lst.c,v 1.30 2020/08/22 16:00:52 skrll Exp $");
+__RCSID("$NetBSD: lst.c,v 1.31 2020/08/22 17:34:25 rillig Exp $");
#endif /* not lint */
#endif
@@ -690,7 +690,7 @@
{
LstNode node;
for (node = src->last; node != NULL; node = node->prev)
- Lst_PrependS(dst, node->datum);
+ Lst_PrependS(dst, node->datum);
}
/* Copy the element data from src to the end of dst. */
@@ -699,7 +699,7 @@
{
LstNode node;
for (node = src->first; node != NULL; node = node->next)
- Lst_AppendS(dst, node->datum);
+ Lst_AppendS(dst, node->datum);
}
/*
diff -r 9a32aefeaa9d -r 655edcb32010 usr.bin/make/main.c
--- a/usr.bin/make/main.c Sat Aug 22 17:32:55 2020 +0000
+++ b/usr.bin/make/main.c Sat Aug 22 17:34:25 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.308 2020/08/22 15:17:09 rillig Exp $ */
+/* $NetBSD: main.c,v 1.309 2020/08/22 17:34:25 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -69,7 +69,7 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: main.c,v 1.308 2020/08/22 15:17:09 rillig Exp $";
+static char rcsid[] = "$NetBSD: main.c,v 1.309 2020/08/22 17:34:25 rillig Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
@@ -81,7 +81,7 @@
#if 0
static char sccsid[] = "@(#)main.c 8.3 (Berkeley) 3/19/94";
#else
-__RCSID("$NetBSD: main.c,v 1.308 2020/08/22 15:17:09 rillig Exp $");
+__RCSID("$NetBSD: main.c,v 1.309 2020/08/22 17:34:25 rillig Exp $");
#endif
#endif /* not lint */
#endif
@@ -1529,7 +1529,7 @@
fname = path;
goto found;
}
- free(path);
+ free(path);
/* If curdir failed, try objdir (ala .depend) */
path = str_concat3(objdir, "/", fname);
diff -r 9a32aefeaa9d -r 655edcb32010 usr.bin/make/meta.c
--- a/usr.bin/make/meta.c Sat Aug 22 17:32:55 2020 +0000
+++ b/usr.bin/make/meta.c Sat Aug 22 17:34:25 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: meta.c,v 1.96 2020/08/22 15:17:09 rillig Exp $ */
+/* $NetBSD: meta.c,v 1.97 2020/08/22 17:34:25 rillig Exp $ */
/*
* Implement 'meta' mode.
@@ -1010,8 +1010,8 @@
}
if (metaIgnorePatterns) {
- const char *expr;
- char *pm;
+ const char *expr;
+ char *pm;
Var_Set(".p.", p, gn);
expr = "${" MAKE_META_IGNORE_PATTERNS ":@m@${.p.:M$m}@}";
diff -r 9a32aefeaa9d -r 655edcb32010 usr.bin/make/parse.c
--- a/usr.bin/make/parse.c Sat Aug 22 17:32:55 2020 +0000
+++ b/usr.bin/make/parse.c Sat Aug 22 17:34:25 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: parse.c,v 1.257 2020/08/22 15:17:09 rillig Exp $ */
+/* $NetBSD: parse.c,v 1.258 2020/08/22 17:34:25 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: parse.c,v 1.257 2020/08/22 15:17:09 rillig Exp $";
+static char rcsid[] = "$NetBSD: parse.c,v 1.258 2020/08/22 17:34:25 rillig Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)parse.c 8.3 (Berkeley) 3/19/94";
#else
-__RCSID("$NetBSD: parse.c,v 1.257 2020/08/22 15:17:09 rillig Exp $");
+__RCSID("$NetBSD: parse.c,v 1.258 2020/08/22 17:34:25 rillig Exp $");
#endif
#endif /* not lint */
#endif
@@ -2746,7 +2746,7 @@
free(curFile);
if (Lst_IsEmpty(includes)) {
- curFile = NULL;
+ curFile = NULL;
/* We've run out of input */
Var_Delete(".PARSEDIR", VAR_GLOBAL);
Var_Delete(".PARSEFILE", VAR_GLOBAL);
diff -r 9a32aefeaa9d -r 655edcb32010 usr.bin/make/var.c
--- a/usr.bin/make/var.c Sat Aug 22 17:32:55 2020 +0000
+++ b/usr.bin/make/var.c Sat Aug 22 17:34:25 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: var.c,v 1.455 2020/08/22 17:32:55 rillig Exp $ */
+/* $NetBSD: var.c,v 1.456 2020/08/22 17:34:25 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: var.c,v 1.455 2020/08/22 17:32:55 rillig Exp $";
+static char rcsid[] = "$NetBSD: var.c,v 1.456 2020/08/22 17:34:25 rillig Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)var.c 8.3 (Berkeley) 3/19/94";
#else
-__RCSID("$NetBSD: var.c,v 1.455 2020/08/22 17:32:55 rillig Exp $");
+__RCSID("$NetBSD: var.c,v 1.456 2020/08/22 17:34:25 rillig Exp $");
#endif
#endif /* not lint */
#endif
@@ -920,7 +920,7 @@
Var *v;
if (strchr(name, '$') != NULL) {
- const char *unexpanded_name = name;
+ const char *unexpanded_name = name;
name = name_freeIt = Var_Subst(name, ctxt, VARE_WANTRES);
if (name[0] == '\0') {
VAR_DEBUG("Var_Append(\"%s\", \"%s\", ...) "
@@ -3071,7 +3071,7 @@
char eflags_str[VarEvalFlags_ToStringSize];
char vflags_str[VarFlags_ToStringSize];
Boolean is_single_char = mod[0] != '\0' &&
- (mod[1] == endc || mod[1] == ':');
+ (mod[1] == endc || mod[1] == ':');
/* At this point, only the first character of the modifier can
* be used since the end of the modifier is not yet known. */
Home |
Main Index |
Thread Index |
Old Index