*: placate warnings where strchr/strstr returns constant pointer

Newer glibc is now smarter and can propagate const-ness from those!

function                                             old     new   delta
readtoken1                                          3111    3108      -3

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

4 files changed, 7 insertions, 6 deletions

diff --git a/libbb/get_last_path_component.c b/libbb/get_last_path_component.c
index 04fdf2a3e..f9d56ad23 100644
--- a/libbb/get_last_path_component.c
+++ b/libbb/get_last_path_component.c
@@ -24,12 +24,12 @@ const char* FAST_FUNC bb_basename(const char *name)
  */
 char* FAST_FUNC bb_get_last_path_component_nostrip(const char *path)
 {
-        char *slash = strrchr(path, '/');
+        const char *slash = strrchr(path, '/');
 
         if (!slash || (slash == path && !slash[1]))
                 return (char*)path;
 
-        return slash + 1;
+        return (char*)slash + 1;
 }
 
 /*
diff --git a/libbb/replace.c b/libbb/replace.c
index bc26b04cc..273330f8a 100644
--- a/libbb/replace.c
+++ b/libbb/replace.c
@@ -28,7 +28,8 @@ unsigned FAST_FUNC count_strstr(const char *str, const char *sub)
 
 char* FAST_FUNC xmalloc_substitute_string(const char *src, int count, const char *sub, const char *repl)
 {
-        char *buf, *dst, *end;
+        char *buf, *dst;
+        const char *end;
         size_t sub_len = strlen(sub);
         size_t repl_len = strlen(repl);
 
diff --git a/libbb/strrstr.c b/libbb/strrstr.c
index a173b034f..bea5d1773 100644
--- a/libbb/strrstr.c
+++ b/libbb/strrstr.c
@@ -19,10 +19,10 @@ char* FAST_FUNC strrstr(const char *haystack, const char *needle)
         if (!needle[0])
                 return (char*)haystack + strlen(haystack);
         while (1) {
-                char *p = strstr(haystack, needle);
+                const char *p = strstr(haystack, needle);
                 if (!p)
                         return r;
-                r = p;
+                r = (char *)p;
                 haystack = p + 1;
         }
 }
diff --git a/libbb/xfuncs_printf.c b/libbb/xfuncs_printf.c
index ed10084b3..8afa1ef68 100644
--- a/libbb/xfuncs_printf.c
+++ b/libbb/xfuncs_printf.c
@@ -379,7 +379,7 @@ void FAST_FUNC bb_unsetenv(const char *var)
         char onstack[128 - 16]; /* smaller stack setup code on x86 */
         char *tp;
 
-        tp = strchr(var, '=');
+        tp = (char*)strchr(var, '=');
         if (tp) {
                 /* In case var was putenv'ed, we can't replace '='
                  * with NUL and unsetenv(var) - it won't work,