Module Name: src
Committed By: rillig
Date: Sat Aug 22 08:01:34 UTC 2020
Modified Files:
src/usr.bin/make: compat.c job.c job.h make.c suff.c
Log Message:
make(1): remove form feeds in the code
To generate a diff of this commit:
cvs rdiff -u -r1.119 -r1.120 src/usr.bin/make/compat.c
cvs rdiff -u -r1.207 -r1.208 src/usr.bin/make/job.c
cvs rdiff -u -r1.44 -r1.45 src/usr.bin/make/job.h
cvs rdiff -u -r1.107 -r1.108 src/usr.bin/make/make.c
cvs rdiff -u -r1.100 -r1.101 src/usr.bin/make/suff.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/compat.c
diff -u src/usr.bin/make/compat.c:1.119 src/usr.bin/make/compat.c:1.120
--- src/usr.bin/make/compat.c:1.119 Fri Aug 21 03:36:03 2020
+++ src/usr.bin/make/compat.c Sat Aug 22 08:01:34 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: compat.c,v 1.119 2020/08/21 03:36:03 rillig Exp $ */
+/* $NetBSD: compat.c,v 1.120 2020/08/22 08:01:34 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: compat.c,v 1.119 2020/08/21 03:36:03 rillig Exp $";
+static char rcsid[] = "$NetBSD: compat.c,v 1.120 2020/08/22 08:01:34 rillig Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)compat.c 8.2 (Berkeley) 3/19/94";
#else
-__RCSID("$NetBSD: compat.c,v 1.119 2020/08/21 03:36:03 rillig Exp $");
+__RCSID("$NetBSD: compat.c,v 1.120 2020/08/22 08:01:34 rillig Exp $");
#endif
#endif /* not lint */
#endif
@@ -187,7 +187,7 @@ CompatInterrupt(int signo)
kill(myPid, signo);
}
}
-
+
/*-
*-----------------------------------------------------------------------
* CompatRunCommand --
@@ -499,7 +499,7 @@ again:
return status;
}
-
+
/*-
*-----------------------------------------------------------------------
* Compat_Make --
@@ -680,7 +680,7 @@ cohorts:
Lst_ForEach(gn->cohorts, Compat_Make, pgnp);
return 0;
}
-
+
/*-
*-----------------------------------------------------------------------
* Compat_Run --
Index: src/usr.bin/make/job.c
diff -u src/usr.bin/make/job.c:1.207 src/usr.bin/make/job.c:1.208
--- src/usr.bin/make/job.c:1.207 Fri Aug 21 02:20:47 2020
+++ src/usr.bin/make/job.c Sat Aug 22 08:01:34 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: job.c,v 1.207 2020/08/21 02:20:47 rillig Exp $ */
+/* $NetBSD: job.c,v 1.208 2020/08/22 08:01:34 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: job.c,v 1.207 2020/08/21 02:20:47 rillig Exp $";
+static char rcsid[] = "$NetBSD: job.c,v 1.208 2020/08/22 08:01:34 rillig Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)job.c 8.2 (Berkeley) 3/19/94";
#else
-__RCSID("$NetBSD: job.c,v 1.207 2020/08/21 02:20:47 rillig Exp $");
+__RCSID("$NetBSD: job.c,v 1.208 2020/08/22 08:01:34 rillig Exp $");
#endif
#endif /* not lint */
#endif
@@ -2771,7 +2771,6 @@ Job_AbortAll(void)
continue;
}
-
/*-
*-----------------------------------------------------------------------
* JobRestartJobs --
Index: src/usr.bin/make/job.h
diff -u src/usr.bin/make/job.h:1.44 src/usr.bin/make/job.h:1.45
--- src/usr.bin/make/job.h:1.44 Thu Aug 13 03:54:57 2020
+++ src/usr.bin/make/job.h Sat Aug 22 08:01:34 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: job.h,v 1.44 2020/08/13 03:54:57 rillig Exp $ */
+/* $NetBSD: job.h,v 1.45 2020/08/22 08:01:34 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -110,7 +110,6 @@ emul_poll(struct pollfd *fd, int nfd, in
*/
#define POLL_MSEC 5000
-
/*-
* Job Table definitions.
*
@@ -179,7 +178,6 @@ typedef struct Job {
#define inPipe jobPipe[0]
#define outPipe jobPipe[1]
-
/*-
* Shell Specifications:
* Each shell type has associated with it the following information:
Index: src/usr.bin/make/make.c
diff -u src/usr.bin/make/make.c:1.107 src/usr.bin/make/make.c:1.108
--- src/usr.bin/make/make.c:1.107 Fri Aug 21 04:42:02 2020
+++ src/usr.bin/make/make.c Sat Aug 22 08:01:34 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: make.c,v 1.107 2020/08/21 04:42:02 rillig Exp $ */
+/* $NetBSD: make.c,v 1.108 2020/08/22 08:01:34 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: make.c,v 1.107 2020/08/21 04:42:02 rillig Exp $";
+static char rcsid[] = "$NetBSD: make.c,v 1.108 2020/08/22 08:01:34 rillig Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)make.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: make.c,v 1.107 2020/08/21 04:42:02 rillig Exp $");
+__RCSID("$NetBSD: make.c,v 1.108 2020/08/22 08:01:34 rillig Exp $");
#endif
#endif /* not lint */
#endif
@@ -189,7 +189,7 @@ MakeTimeStamp(void *pgn, void *cgn)
{
return Make_TimeStamp((GNode *)pgn, (GNode *)cgn);
}
-
+
/*-
*-----------------------------------------------------------------------
* Make_OODate --
@@ -350,7 +350,7 @@ Make_OODate(GNode *gn)
return oodate;
}
-
+
/*-
*-----------------------------------------------------------------------
* MakeAddChild --
@@ -382,7 +382,7 @@ MakeAddChild(void *gnp, void *lp)
}
return 0;
}
-
+
/*-
*-----------------------------------------------------------------------
* MakeFindChild --
@@ -412,7 +412,7 @@ MakeFindChild(void *gnp, void *pgnp)
return 0;
}
-
+
/*-
*-----------------------------------------------------------------------
* Make_HandleUse --
@@ -840,7 +840,7 @@ Make_Update(GNode *cgn)
Lst_CloseS(cgn->iParents);
}
}
-
+
/*-
*-----------------------------------------------------------------------
* MakeAddAllSrc --
@@ -934,7 +934,7 @@ MakeAddAllSrc(void *cgnp, void *pgnp)
}
return 0;
}
-
+
/*-
*-----------------------------------------------------------------------
* Make_DoAllVar --
@@ -980,7 +980,7 @@ Make_DoAllVar(GNode *gn)
}
gn->flags |= DONE_ALLSRC;
}
-
+
/*-
*-----------------------------------------------------------------------
* MakeStartJobs --
@@ -1147,7 +1147,7 @@ MakeStartJobs(void)
return FALSE;
}
-
+
/*-
*-----------------------------------------------------------------------
* MakePrintStatus --
@@ -1262,7 +1262,7 @@ MakePrintStatus(void *gnp, void *v_error
Lst_ForEach(gn->children, MakePrintStatus, errors);
return 0;
}
-
+
/*-
*-----------------------------------------------------------------------
Index: src/usr.bin/make/suff.c
diff -u src/usr.bin/make/suff.c:1.100 src/usr.bin/make/suff.c:1.101
--- src/usr.bin/make/suff.c:1.100 Fri Aug 21 04:42:02 2020
+++ src/usr.bin/make/suff.c Sat Aug 22 08:01:34 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: suff.c,v 1.100 2020/08/21 04:42:02 rillig Exp $ */
+/* $NetBSD: suff.c,v 1.101 2020/08/22 08:01:34 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: suff.c,v 1.100 2020/08/21 04:42:02 rillig Exp $";
+static char rcsid[] = "$NetBSD: suff.c,v 1.101 2020/08/22 08:01:34 rillig Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)suff.c 8.4 (Berkeley) 3/21/94";
#else
-__RCSID("$NetBSD: suff.c,v 1.100 2020/08/21 04:42:02 rillig Exp $");
+__RCSID("$NetBSD: suff.c,v 1.101 2020/08/22 08:01:34 rillig Exp $");
#endif
#endif /* not lint */
#endif
@@ -475,7 +475,7 @@ SuffRemove(Lst l, Suff *s)
SuffFree(s);
}
}
-
+
/*-
*-----------------------------------------------------------------------
* SuffInsert --
