Module Name: src
Committed By: rillig
Date: Sat Dec 19 13:16:25 UTC 2020
Modified Files:
src/usr.bin/make: make.c parse.c
Log Message:
make(1): rename parameter line to lineno
To generate a diff of this commit:
cvs rdiff -u -r1.231 -r1.232 src/usr.bin/make/make.c
cvs rdiff -u -r1.495 -r1.496 src/usr.bin/make/parse.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/make.c
diff -u src/usr.bin/make/make.c:1.231 src/usr.bin/make/make.c:1.232
--- src/usr.bin/make/make.c:1.231 Fri Dec 18 15:47:34 2020
+++ src/usr.bin/make/make.c Sat Dec 19 13:16:25 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: make.c,v 1.231 2020/12/18 15:47:34 rillig Exp $ */
+/* $NetBSD: make.c,v 1.232 2020/12/19 13:16:25 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -102,7 +102,7 @@
#include "job.h"
/* "@(#)make.c 8.1 (Berkeley) 6/6/93" */
-MAKE_RCSID("$NetBSD: make.c,v 1.231 2020/12/18 15:47:34 rillig Exp $");
+MAKE_RCSID("$NetBSD: make.c,v 1.232 2020/12/19 13:16:25 rillig Exp $");
/* Sequence # to detect recursion. */
static unsigned int checked_seqno = 1;
@@ -124,10 +124,10 @@ debug_printf(const char *fmt, ...)
}
MAKE_ATTR_DEAD static void
-make_abort(GNode *gn, int line)
+make_abort(GNode *gn, int lineno)
{
- debug_printf("make_abort from line %d\n", line);
+ debug_printf("make_abort from line %d\n", lineno);
Targ_PrintNode(gn, 2);
Targ_PrintNodes(&toBeMade, 2);
Targ_PrintGraph(3);
Index: src/usr.bin/make/parse.c
diff -u src/usr.bin/make/parse.c:1.495 src/usr.bin/make/parse.c:1.496
--- src/usr.bin/make/parse.c:1.495 Sat Dec 19 12:48:59 2020
+++ src/usr.bin/make/parse.c Sat Dec 19 13:16:25 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: parse.c,v 1.495 2020/12/19 12:48:59 rillig Exp $ */
+/* $NetBSD: parse.c,v 1.496 2020/12/19 13:16:25 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.495 2020/12/19 12:48:59 rillig Exp $");
+MAKE_RCSID("$NetBSD: parse.c,v 1.496 2020/12/19 13:16:25 rillig Exp $");
/* types and constants */
@@ -2429,7 +2429,7 @@ ParseTrackInput(const char *name)
* The given file is added to the includes stack.
*/
void
-Parse_SetInput(const char *name, int line, int fd,
+Parse_SetInput(const char *name, int lineno, int fd,
ReadMoreProc readMore, void *readMoreArg)
{
IFile *curFile;
@@ -2447,7 +2447,7 @@ Parse_SetInput(const char *name, int lin
? "loadedfile" : "other";
debug_printf(
"%s: file %s, line %d, fd %d, readMore %s, readMoreArg %p\n",
- __func__, name, line, fd, caller, readMoreArg);
+ __func__, name, lineno, fd, caller, readMoreArg);
}
if (fd == -1 && readMore == NULL)
@@ -2457,8 +2457,8 @@ Parse_SetInput(const char *name, int lin
curFile = Vector_Push(&includes);
curFile->fname = bmake_strdup(name);
curFile->fromForLoop = fromForLoop;
- curFile->lineno = line;
- curFile->first_lineno = line;
+ curFile->lineno = lineno;
+ curFile->first_lineno = lineno;
curFile->readMore = readMore;
curFile->readMoreArg = readMoreArg;
curFile->lf = NULL;
