CVS commit: src/usr.bin/make

[Roland Illig]

Module Name:    src
Committed By:   rillig
Date:           Thu Oct  1 23:44:36 UTC 2020

Modified Files:
        src/usr.bin/make: main.c nonints.h parse.c

Log Message:
make(1): add missing const for Parse_AddIncludeDir


To generate a diff of this commit:
cvs rdiff -u -r1.359 -r1.360 src/usr.bin/make/main.c
cvs rdiff -u -r1.132 -r1.133 src/usr.bin/make/nonints.h
cvs rdiff -u -r1.343 -r1.344 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/main.c
diff -u src/usr.bin/make/main.c:1.359 src/usr.bin/make/main.c:1.360
--- src/usr.bin/make/main.c:1.359	Thu Oct  1 23:42:22 2020
+++ src/usr.bin/make/main.c	Thu Oct  1 23:44:36 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: main.c,v 1.359 2020/10/01 23:42:22 rillig Exp $	*/
+/*	$NetBSD: main.c,v 1.360 2020/10/01 23:44:36 rillig Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -126,7 +126,7 @@
 #endif
 
 /*	"@(#)main.c	8.3 (Berkeley) 3/19/94"	*/
-MAKE_RCSID("$NetBSD: main.c,v 1.359 2020/10/01 23:42:22 rillig Exp $");
+MAKE_RCSID("$NetBSD: main.c,v 1.360 2020/10/01 23:44:36 rillig Exp $");
 #if defined(MAKE_NATIVE) && !defined(lint)
 __COPYRIGHT("@(#) Copyright (c) 1988, 1989, 1990, 1993\
  The Regents of the University of California.  All rights reserved.");
@@ -475,7 +475,7 @@ MainParseArgSysInc(const char *argvalue)
 }
 
 static Boolean
-MainParseArg(char c, char *argvalue)
+MainParseArg(char c, const char *argvalue)
 {
 	switch (c) {
 	case '\0':
@@ -603,7 +603,7 @@ MainParseArg(char c, char *argvalue)
 static void
 MainParseArgs(int argc, char **argv)
 {
-	char c = '?';
+	char c;
 	int arginc;
 	char *argvalue;
 	char *optscan;

Index: src/usr.bin/make/nonints.h
diff -u src/usr.bin/make/nonints.h:1.132 src/usr.bin/make/nonints.h:1.133
--- src/usr.bin/make/nonints.h:1.132	Sun Sep 27 11:37:19 2020
+++ src/usr.bin/make/nonints.h	Thu Oct  1 23:44:36 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: nonints.h,v 1.132 2020/09/27 11:37:19 rillig Exp $	*/
+/*	$NetBSD: nonints.h,v 1.133 2020/10/01 23:44:36 rillig Exp $	*/
 
 /*-
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -123,7 +123,7 @@ char *cached_realpath(const char *, char
 void Parse_Error(int, const char *, ...) MAKE_ATTR_PRINTFLIKE(2, 3);
 Boolean Parse_IsVar(const char *);
 void Parse_DoVar(char *, GNode *);
-void Parse_AddIncludeDir(char *);
+void Parse_AddIncludeDir(const char *);
 void Parse_File(const char *, int);
 void Parse_Init(void);
 void Parse_End(void);

Index: src/usr.bin/make/parse.c
diff -u src/usr.bin/make/parse.c:1.343 src/usr.bin/make/parse.c:1.344
--- src/usr.bin/make/parse.c:1.343	Mon Sep 28 23:13:57 2020
+++ src/usr.bin/make/parse.c	Thu Oct  1 23:44:36 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: parse.c,v 1.343 2020/09/28 23:13:57 rillig Exp $	*/
+/*	$NetBSD: parse.c,v 1.344 2020/10/01 23:44:36 rillig Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -132,7 +132,7 @@
 #include "pathnames.h"
 
 /*	"@(#)parse.c	8.3 (Berkeley) 3/19/94"	*/
-MAKE_RCSID("$NetBSD: parse.c,v 1.343 2020/09/28 23:13:57 rillig Exp $");
+MAKE_RCSID("$NetBSD: parse.c,v 1.344 2020/10/01 23:44:36 rillig Exp $");
 
 /* types and constants */
 
@@ -2031,7 +2031,7 @@ ParseHasCommands(void *gnp)
 /* Add a directory to the path searched for included makefiles bracketed
  * by double-quotes. */
 void
-Parse_AddIncludeDir(char *dir)
+Parse_AddIncludeDir(const char *dir)
 {
     (void)Dir_AddDir(parseIncPath, dir);
 }