ast stresc: remove return value

The computation of the return value for this function was relying on string
lengths that fitted in an `int`, something that is generally but not always
true. The compiler complained about this with -Wconversion. The only caller of
this function does not use the return value, so lets just remove it.

diff --git a/lib/ast/ast.h b/lib/ast/ast.h
index d53760a001e9701950eb8d48acccd79d03253601..bbbdce44fb39adc2881b2641f6e0df57520290ea 100644 (file)
--- a/lib/ast/ast.h
+++ b/lib/ast/ast.h
@@ -75,7 +75,7 @@ extern "C" {
 
     extern int strmatch(const char *, const char *);
     extern int strgrpmatch(const char *, const char *, int *, int, int);
-    extern int stresc(char *);
+    extern void stresc(char *);
     extern char *strcopy(char *s, const char *t);
 
 #ifdef __cplusplus

diff --git a/lib/ast/stresc.c b/lib/ast/stresc.c
index 0d8be317b03af7f39d73bcfd1ce0a37bcf16ad25..75c2d118dd4687d764f0133d289d81ae8e82d9c2 100644 (file)
--- a/lib/ast/stresc.c
+++ b/lib/ast/stresc.c
@@ -13,19 +13,17 @@
  * AT&T Bell Laboratories
  *
  * convert \x character constants in s in place
- * the length of the converted s is returned (may have imbedded \0's)
  */
 
 #include <ast/ast.h>
 
-int stresc(char *s)
+void stresc(char *s)
 {
     char *t;
     int c;
-    char *b;
     char *p;
 
-    b = t = s;
+    t = s;
     for (;;) {
        switch (c = *s++) {
        case '\\':
@@ -34,7 +32,7 @@ int stresc(char *s)
            break;
        case 0:
            *t = 0;
-           return (t - b);
+           return;
        }
        *t++ = c;
     }