Module Name: src
Committed By: rillig
Date: Fri Sep 25 19:50:04 UTC 2020
Modified Files:
src/usr.bin/make: nonints.h suff.c
Log Message:
make(1): declare strings for suff.c constant
To generate a diff of this commit:
cvs rdiff -u -r1.128 -r1.129 src/usr.bin/make/nonints.h
cvs rdiff -u -r1.166 -r1.167 src/usr.bin/make/suff.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/nonints.h
diff -u src/usr.bin/make/nonints.h:1.128 src/usr.bin/make/nonints.h:1.129
--- src/usr.bin/make/nonints.h:1.128 Fri Sep 25 15:54:50 2020
+++ src/usr.bin/make/nonints.h Fri Sep 25 19:50:04 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: nonints.h,v 1.128 2020/09/25 15:54:50 rillig Exp $ */
+/* $NetBSD: nonints.h,v 1.129 2020/09/25 19:50:04 rillig Exp $ */
/*-
* Copyright (c) 1988, 1989, 1990, 1993
@@ -152,17 +152,17 @@ Boolean Str_Match(const char *, const ch
/* suff.c */
void Suff_ClearSuffixes(void);
-Boolean Suff_IsTransform(char *);
-GNode *Suff_AddTransform(char *);
+Boolean Suff_IsTransform(const char *);
+GNode *Suff_AddTransform(const char *);
void Suff_EndTransform(GNode *);
void Suff_AddSuffix(const char *, GNode **);
-SearchPath *Suff_GetPath(char *);
+SearchPath *Suff_GetPath(const char *);
void Suff_DoPaths(void);
-void Suff_AddInclude(char *);
+void Suff_AddInclude(const char *);
void Suff_AddLib(const char *);
void Suff_FindDeps(GNode *);
SearchPath *Suff_FindPath(GNode *);
-void Suff_SetNull(char *);
+void Suff_SetNull(const char *);
void Suff_Init(void);
void Suff_End(void);
void Suff_PrintAll(void);
Index: src/usr.bin/make/suff.c
diff -u src/usr.bin/make/suff.c:1.166 src/usr.bin/make/suff.c:1.167
--- src/usr.bin/make/suff.c:1.166 Fri Sep 25 18:58:12 2020
+++ src/usr.bin/make/suff.c Fri Sep 25 19:50:04 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: suff.c,v 1.166 2020/09/25 18:58:12 rillig Exp $ */
+/* $NetBSD: suff.c,v 1.167 2020/09/25 19:50:04 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -126,7 +126,7 @@
#include "dir.h"
/* "@(#)suff.c 8.4 (Berkeley) 3/21/94" */
-MAKE_RCSID("$NetBSD: suff.c,v 1.166 2020/09/25 18:58:12 rillig Exp $");
+MAKE_RCSID("$NetBSD: suff.c,v 1.167 2020/09/25 19:50:04 rillig Exp $");
#define SUFF_DEBUG0(fmt) \
if (!DEBUG(SUFF)) (void) 0; else fprintf(debug_file, fmt)
@@ -464,11 +464,11 @@ Suff_ClearSuffixes(void)
* TRUE if the string is a valid transformation, FALSE otherwise.
*/
static Boolean
-SuffParseTransform(char *str, Suff **out_src, Suff **out_targ)
+SuffParseTransform(const char *str, Suff **out_src, Suff **out_targ)
{
SuffListNode *srcLn; /* element in suffix list of trans source*/
Suff *src; /* Source of transformation */
- char *str2; /* Extra pointer (maybe target suffix) */
+ const char *str2; /* Extra pointer (maybe target suffix) */
SuffListNode *singleLn; /* element in suffix list of any suffix
* that exactly matches str */
Suff *single = NULL; /* Source of possible transformation to
@@ -529,7 +529,7 @@ SuffParseTransform(char *str, Suff **out
/* Return TRUE if the given string is a transformation rule, that is, a
* concatenation of two known suffixes. */
Boolean
-Suff_IsTransform(char *str)
+Suff_IsTransform(const char *str)
{
Suff *src, *targ;
@@ -549,7 +549,7 @@ Suff_IsTransform(char *str)
* The node created for the transformation in the transforms list
*/
GNode *
-Suff_AddTransform(char *line)
+Suff_AddTransform(const char *line)
{
GNode *gn; /* GNode of transformation rule */
Suff *s, /* source suffix */
@@ -803,7 +803,7 @@ Suff_AddSuffix(const char *name, GNode *
/* Return the search path for the given suffix, or NULL. */
SearchPath *
-Suff_GetPath(char *sname)
+Suff_GetPath(const char *sname)
{
Suff *s = FindSuffByName(sname);
return s != NULL ? s->searchPath : NULL;
@@ -871,7 +871,7 @@ Suff_DoPaths(void)
* sname Name of the suffix to mark
*/
void
-Suff_AddInclude(char *sname)
+Suff_AddInclude(const char *sname)
{
Suff *suff = FindSuffByName(sname);
if (suff != NULL)
@@ -2095,7 +2095,7 @@ SuffFindDeps(GNode *gn, SrcList *slst)
* name Name of null suffix
*/
void
-Suff_SetNull(char *name)
+Suff_SetNull(const char *name)
{
Suff *s = FindSuffByName(name);
if (s == NULL) {
