[src/trunk]: src/usr.bin/make make(1): rename parameter line to lineno

[rillig <rillig%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/48908ed69a9e
branches:  trunk
changeset: 957969:48908ed69a9e
user:      rillig <rillig%NetBSD.org@localhost>
date:      Sat Dec 19 13:16:25 2020 +0000

description:
make(1): rename parameter line to lineno

diffstat:

 usr.bin/make/make.c  |   8 ++++----
 usr.bin/make/parse.c |  12 ++++++------
 2 files changed, 10 insertions(+), 10 deletions(-)

diffs (78 lines):

diff -r 233a19a44326 -r 48908ed69a9e usr.bin/make/make.c
--- a/usr.bin/make/make.c       Sat Dec 19 12:55:28 2020 +0000
+++ b/usr.bin/make/make.c       Sat Dec 19 13:16:25 2020 +0000
@@ -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 @@
 }
 
 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);
diff -r 233a19a44326 -r 48908ed69a9e usr.bin/make/parse.c
--- a/usr.bin/make/parse.c      Sat Dec 19 12:55:28 2020 +0000
+++ b/usr.bin/make/parse.c      Sat Dec 19 13:16:25 2020 +0000
@@ -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 @@
  * 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 @@
                    ? "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 @@
        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;