From: Pádraig Brady <P@draigBrady.com>
Date: Tue, 7 Apr 2026 13:35:25 +0000 (+0100)
Subject: maint: cut: avoid discarded-qualifiers warnings
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2e7fc39ec16a2204c2abd2de90c8d9ba651d9eda;p=thirdparty%2Fcoreutils.git

maint: cut: avoid discarded-qualifiers warnings

Seen on GCC 15.2.1 with GLIBC 2.43 on Arch
Not seen on GCC 15.2.1 on GLIBC 2.42 on Fedora

* src/cut.c (search_bytes): Cast the return from memchr()
to avoid const propagation.
(find_field_delim): Adjust the return from strstr() similarly.
https://github.com/coreutils/coreutils/issues/244
---

diff --git a/src/cut.c b/src/cut.c
index eb82c04494..6fa4d0727e 100644
--- a/src/cut.c
+++ b/src/cut.c
@@ -437,7 +437,7 @@ search_bytes (char const *buf, int c, size_t n_bytes)
   if (1 < n_bytes && to_uchar (buf[1]) == c)
     return (char *) buf + 1;
 
-  return 2 < n_bytes ? memchr (buf + 2, c, n_bytes - 2) : NULL;
+  return 2 < n_bytes ? (char *) memchr (buf + 2, c, n_bytes - 2) : NULL;
 }
 
 static inline void
@@ -598,18 +598,18 @@ find_field_delim (char *buf, size_t len)
       char const *nul = memchr (p, '\0', end - p);
       if (!nul)
         {
-          char *match = strstr (p, delim_bytes);
+          char const *match = strstr (p, delim_bytes);
           buf[len] = saved;
-          return match;
+          return (char *) match;
         }
 
       if (p < nul)
         {
-          char *match = strstr (p, delim_bytes);
+          char const *match = strstr (p, delim_bytes);
           if (match)
             {
               buf[len] = saved;
-              return match;
+              return (char *) match;
             }
         }