CVS commit: src/usr.bin/make

[Roland Illig]

Module Name:    src
Committed By:   rillig
Date:           Thu Aug 19 15:50:30 UTC 2021

Modified Files:
        src/usr.bin/make: meta.c

Log Message:
make: fix lint warning about strrchr discarding 'const'

No functional change.


To generate a diff of this commit:
cvs rdiff -u -r1.182 -r1.183 src/usr.bin/make/meta.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/meta.c
diff -u src/usr.bin/make/meta.c:1.182 src/usr.bin/make/meta.c:1.183
--- src/usr.bin/make/meta.c:1.182	Sat Aug 14 13:04:00 2021
+++ src/usr.bin/make/meta.c	Thu Aug 19 15:50:30 2021
@@ -1,4 +1,4 @@
-/*      $NetBSD: meta.c,v 1.182 2021/08/14 13:04:00 rillig Exp $ */
+/*      $NetBSD: meta.c,v 1.183 2021/08/19 15:50:30 rillig Exp $ */
 
 /*
  * Implement 'meta' mode.
@@ -244,8 +244,8 @@ meta_name(char *mname, size_t mnamelen,
 	  const char *cwd)
 {
     char buf[MAXPATHLEN];
-    char *rp;
-    char *cp;
+    char *rp, *cp;
+    const char *tname_base;
     char *tp;
     char *dtp;
     size_t ldname;
@@ -257,13 +257,13 @@ meta_name(char *mname, size_t mnamelen,
      * So we use realpath() just to get the dirname, and leave the
      * basename as given to us.
      */
-    if ((cp = strrchr(tname, '/')) != NULL) {
+    if ((tname_base = strrchr(tname, '/')) != NULL) {
 	if (cached_realpath(tname, buf) != NULL) {
 	    if ((rp = strrchr(buf, '/')) != NULL) {
 		rp++;
-		cp++;
-		if (strcmp(cp, rp) != 0)
-		    strlcpy(rp, cp, sizeof buf - (size_t)(rp - buf));
+		tname_base++;
+		if (strcmp(tname_base, rp) != 0)
+		    strlcpy(rp, tname_base, sizeof buf - (size_t)(rp - buf));
 	    }
 	    tname = buf;
 	} else {
@@ -552,9 +552,9 @@ meta_create(BuildMon *pbm, GNode *gn)
 }
 
 static bool
-boolValue(char *s)
+boolValue(const char *s)
 {
-    switch(*s) {
+    switch (*s) {
     case '0':
     case 'N':
     case 'n':
@@ -589,7 +589,7 @@ void
 meta_mode_init(const char *make_mode)
 {
     static bool once = false;
-    char *cp;
+    const char *cp;
     FStr value;
 
     useMeta = true;