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 the GNode lineno unsigned to fix lint warn...



details:   https://anonhg.NetBSD.org/src/rev/1260241f4264
branches:  trunk
changeset: 359906:1260241f4264
user:      christos <christos%NetBSD.org@localhost>
date:      Sun Jan 30 13:21:08 2022 +0000

description:
Make the GNode lineno unsigned to fix lint warning in var.c calling
PrintLocation()

diffstat:

 usr.bin/make/dir.c  |  6 +++---
 usr.bin/make/job.c  |  6 +++---
 usr.bin/make/make.h |  4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diffs (72 lines):

diff -r 48306bd856f0 -r 1260241f4264 usr.bin/make/dir.c
--- a/usr.bin/make/dir.c        Sun Jan 30 13:11:46 2022 +0000
+++ b/usr.bin/make/dir.c        Sun Jan 30 13:21:08 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: dir.c,v 1.276 2021/12/15 12:24:13 rillig Exp $ */
+/*     $NetBSD: dir.c,v 1.277 2022/01/30 13:21:08 christos Exp $       */
 
 /*
  * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -138,7 +138,7 @@
 #include "job.h"
 
 /*     "@(#)dir.c      8.2 (Berkeley) 1/2/94"  */
-MAKE_RCSID("$NetBSD: dir.c,v 1.276 2021/12/15 12:24:13 rillig Exp $");
+MAKE_RCSID("$NetBSD: dir.c,v 1.277 2022/01/30 13:21:08 christos Exp $");
 
 /*
  * A search path is a list of CachedDir structures. A CachedDir has in it the
@@ -1425,7 +1425,7 @@
        gn->path = bmake_strdup(fullName);
        if (!Job_RunTarget(".STALE", gn->fname))
                fprintf(stdout, /* XXX: Why stdout? */
-                   "%s: %s, %d: ignoring stale %s for %s, found %s\n",
+                   "%s: %s, %zu: ignoring stale %s for %s, found %s\n",
                    progname, gn->fname, gn->lineno,
                    makeDependfile, gn->name, fullName);
 
diff -r 48306bd856f0 -r 1260241f4264 usr.bin/make/job.c
--- a/usr.bin/make/job.c        Sun Jan 30 13:11:46 2022 +0000
+++ b/usr.bin/make/job.c        Sun Jan 30 13:21:08 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: job.c,v 1.449 2022/01/22 18:59:23 rillig Exp $ */
+/*     $NetBSD: job.c,v 1.450 2022/01/30 13:21:08 christos Exp $       */
 
 /*
  * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -142,7 +142,7 @@
 #include "trace.h"
 
 /*     "@(#)job.c      8.2 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: job.c,v 1.449 2022/01/22 18:59:23 rillig Exp $");
+MAKE_RCSID("$NetBSD: job.c,v 1.450 2022/01/30 13:21:08 christos Exp $");
 
 /*
  * A shell defines how the commands are run.  All commands for a target are
@@ -1374,7 +1374,7 @@
        if (gn->flags.fromDepend) {
                if (!Job_RunTarget(".STALE", gn->fname))
                        fprintf(stdout,
-                           "%s: %s, %d: ignoring stale %s for %s\n",
+                           "%s: %s, %zu: ignoring stale %s for %s\n",
                            progname, gn->fname, gn->lineno, makeDependfile,
                            gn->name);
                return true;
diff -r 48306bd856f0 -r 1260241f4264 usr.bin/make/make.h
--- a/usr.bin/make/make.h       Sun Jan 30 13:11:46 2022 +0000
+++ b/usr.bin/make/make.h       Sun Jan 30 13:21:08 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: make.h,v 1.294 2022/01/29 10:19:49 rillig Exp $        */
+/*     $NetBSD: make.h,v 1.295 2022/01/30 13:21:08 christos Exp $      */
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -499,7 +499,7 @@
        /* Filename where the GNode got defined, unlimited lifetime */
        const char *fname;
        /* Line number where the GNode got defined, 1-based */
-       int lineno;
+       size_t lineno;
 } GNode;
 
 /* Error levels for diagnostics during parsing. */



Home | Main Index | Thread Index | Old Index