* character.h (STRING_CHAR, STRING_CHAR_AND_LENGTH): Remove

ignored second argument.  All callers changed.
* regex.c (STRING_CHAR, STRING_CHAR_AND_LENGTH, RE_STRING_CHAR)
(RE_STRING_CHAR_AND_LENGTH): Likewise.
* xdisp.c (string_char_and_length): Likewise.

1 files changed, 2 insertions, 4 deletions

diff --git a/src/doc.c b/src/doc.c
index 30b909b8ce8..750e0ca7b43 100644
--- a/src/doc.c
+++ b/src/doc.c
@@ -767,9 +767,8 @@ a new string, without any text properties, is returned.  */)
           if (multibyte)
             {
               int len;
-              int maxlen = SDATA (string) + SBYTES (string) - strp;
 
-              STRING_CHAR_AND_LENGTH (strp, maxlen, len);
+              STRING_CHAR_AND_LENGTH (strp, len);
               if (len == 1)
                 *bufp = *strp;
               else
@@ -931,9 +930,8 @@ a new string, without any text properties, is returned.  */)
       else
         {
           int len;
-          int maxlen = SDATA (string) + SBYTES (string) - strp;
 
-          STRING_CHAR_AND_LENGTH (strp, maxlen, len);
+          STRING_CHAR_AND_LENGTH (strp, len);
           if (len == 1)
             *bufp = *strp;
           else