Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/usr.bin/make Do not treat .info as warning for -W



details:   https://anonhg.NetBSD.org/src/rev/d70b89ac6b9e
branches:  trunk
changeset: 829790:d70b89ac6b9e
user:      sjg <sjg%NetBSD.org@localhost>
date:      Mon Feb 12 21:38:09 2018 +0000

description:
Do not treat .info as warning for -W

Reported by: lwhsu at FreeBSD.org

diffstat:

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

diffs (61 lines):

diff -r 705b3b85a6ad -r d70b89ac6b9e usr.bin/make/make.h
--- a/usr.bin/make/make.h       Mon Feb 12 20:47:09 2018 +0000
+++ b/usr.bin/make/make.h       Mon Feb 12 21:38:09 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: make.h,v 1.103 2017/07/20 19:29:54 sjg Exp $   */
+/*     $NetBSD: make.h,v 1.104 2018/02/12 21:38:09 sjg Exp $   */
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -330,6 +330,7 @@
  * once the makefile has been parsed. PARSE_WARNING means it can. Passed
  * as the first argument to Parse_Error.
  */
+#define PARSE_INFO     3
 #define PARSE_WARNING  2
 #define PARSE_FATAL    1
 
diff -r 705b3b85a6ad -r d70b89ac6b9e usr.bin/make/parse.c
--- a/usr.bin/make/parse.c      Mon Feb 12 20:47:09 2018 +0000
+++ b/usr.bin/make/parse.c      Mon Feb 12 21:38:09 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: parse.c,v 1.225 2017/04/17 13:29:07 maya Exp $ */
+/*     $NetBSD: parse.c,v 1.226 2018/02/12 21:38:09 sjg Exp $  */
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
  */
 
 #ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: parse.c,v 1.225 2017/04/17 13:29:07 maya Exp $";
+static char rcsid[] = "$NetBSD: parse.c,v 1.226 2018/02/12 21:38:09 sjg 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.225 2017/04/17 13:29:07 maya Exp $");
+__RCSID("$NetBSD: parse.c,v 1.226 2018/02/12 21:38:09 sjg Exp $");
 #endif
 #endif /* not lint */
 #endif
@@ -703,6 +703,8 @@
        (void)vfprintf(f, fmt, ap);
        (void)fprintf(f, "\n");
        (void)fflush(f);
+       if (type == PARSE_INFO)
+               return;
        if (type == PARSE_FATAL || parseWarnFatal)
                fatals += 1;
        if (parseWarnFatal && !fatal_warning_error_printed) {
@@ -795,7 +797,7 @@
 
     switch(*line) {
     case 'i':
-       mtype = 0;
+       mtype = PARSE_INFO;
        break;
     case 'w':
        mtype = PARSE_WARNING;



Home | Main Index | Thread Index | Old Index