Mercurial > emacs

diff src/print.c @ 106185:f2cea199b0c4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* 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.
author Andreas Schwab <schwab@linux-m68k.org>
date Sat, 21 Nov 2009 11:52:23 +0000
parents cb523092ddfd
children e72085f5ccf5
line wrap: on
line diff
--- a/src/print.c	Sat Nov 21 10:32:20 2009 +0000
+++ b/src/print.c	Sat Nov 21 11:52:23 2009 +0000
@@ -401,7 +401,7 @@
 	  int len;
 	  for (i = 0; i < size_byte; i += len)
 	    {
-	      int ch = STRING_CHAR_AND_LENGTH (ptr + i, size_byte - i, len);
+	      int ch = STRING_CHAR_AND_LENGTH (ptr + i, len);
 	      insert_char (ch);
 	    }
 	}
@@ -427,7 +427,7 @@
 		 corresponding character code before handing it to
 		 PRINTCHAR.  */
 	      int len;
-	      int ch = STRING_CHAR_AND_LENGTH (ptr + i, size_byte - i, len);
+	      int ch = STRING_CHAR_AND_LENGTH (ptr + i, len);
 	      PRINTCHAR (ch);
 	      i += len;
 	    }
@@ -519,8 +519,7 @@
 	    /* Here, we must convert each multi-byte form to the
 	       corresponding character code before handing it to PRINTCHAR.  */
 	    int len;
-	    int ch = STRING_CHAR_AND_LENGTH (SDATA (string) + i,
-					     size_byte - i, len);
+	    int ch = STRING_CHAR_AND_LENGTH (SDATA (string) + i, len);
 	    PRINTCHAR (ch);
 	    i += len;
 	  }
@@ -1645,8 +1644,7 @@
 
 	      if (multibyte)
 		{
-		  c = STRING_CHAR_AND_LENGTH (str + i_byte,
-					      size_byte - i_byte, len);
+		  c = STRING_CHAR_AND_LENGTH (str + i_byte, len);
 		  i_byte += len;
 		}
 	      else