[Emacs-diffs] Changes to emacs/src/charset.c

[Dave Love]

Index: emacs/src/charset.c
diff -c emacs/src/charset.c:1.131 emacs/src/charset.c:1.132
*** emacs/src/charset.c:1.131   Sun Jul 14 20:00:35 2002
--- emacs/src/charset.c Tue Jul 16 15:47:56 2002
***************
*** 802,808 ****
  
  int
  find_charset_in_text (ptr, nchars, nbytes, charsets, table)
!      unsigned char *ptr;
       int nchars, nbytes, *charsets;
       Lisp_Object table;
  {
--- 802,808 ----
  
  int
  find_charset_in_text (ptr, nchars, nbytes, charsets, table)
!      const unsigned char *ptr;
       int nchars, nbytes, *charsets;
       Lisp_Object table;
  {
***************
*** 810,816 ****
      {
        if (charsets && nbytes > 0)
        {
!         unsigned char *endp = ptr + nbytes;
          int maskbits = 0;
  
          while (ptr < endp && maskbits != 7)
--- 810,816 ----
      {
        if (charsets && nbytes > 0)
        {
!         const unsigned char *endp = ptr + nbytes;
          int maskbits = 0;
  
          while (ptr < endp && maskbits != 7)
***************
*** 1271,1277 ****
  
  int
  c_string_width (str, len, precision, nchars, nbytes)
!      unsigned char *str;
       int precision, *nchars, *nbytes;
  {
    int i = 0, i_byte = 0;
--- 1271,1277 ----
  
  int
  c_string_width (str, len, precision, nchars, nbytes)
!      const unsigned char *str;
       int precision, *nchars, *nbytes;
  {
    int i = 0, i_byte = 0;
***************
*** 1337,1343 ****
  {
    int len = SCHARS (string);
    int len_byte = SBYTES (string);
!   unsigned char *str = SDATA (string);
    int i = 0, i_byte = 0;
    int width = 0;
    struct Lisp_Char_Table *dp = buffer_display_table ();
--- 1337,1343 ----
  {
    int len = SCHARS (string);
    int len_byte = SBYTES (string);
!   const unsigned char *str = SDATA (string);
    int i = 0, i_byte = 0;
    int width = 0;
    struct Lisp_Char_Table *dp = buffer_display_table ();
***************
*** 1451,1457 ****
  
  int
  chars_in_text (ptr, nbytes)
!      unsigned char *ptr;
       int nbytes;
  {
    /* current_buffer is null at early stages of Emacs initialization.  */
--- 1451,1457 ----
  
  int
  chars_in_text (ptr, nbytes)
!      const unsigned char *ptr;
       int nbytes;
  {
    /* current_buffer is null at early stages of Emacs initialization.  */
***************
*** 1468,1477 ****
  
  int
  multibyte_chars_in_text (ptr, nbytes)
!      unsigned char *ptr;
       int nbytes;
  {
!   unsigned char *endp;
    int chars, bytes;
  
    endp = ptr + nbytes;
--- 1468,1477 ----
  
  int
  multibyte_chars_in_text (ptr, nbytes)
!      const unsigned char *ptr;
       int nbytes;
  {
!   const unsigned char *endp;
    int chars, bytes;
  
    endp = ptr + nbytes;
***************
*** 1493,1502 ****
     0x80..0x9F are represented by 2 bytes in multibyte text.  */
  void
  parse_str_as_multibyte (str, len, nchars, nbytes)
!      unsigned char *str;
       int len, *nchars, *nbytes;
  {
!   unsigned char *endp = str + len;
    int n, chars = 0, bytes = 0;
  
    while (str < endp)
--- 1493,1502 ----
     0x80..0x9F are represented by 2 bytes in multibyte text.  */
  void
  parse_str_as_multibyte (str, len, nchars, nbytes)
!      const unsigned char *str;
       int len, *nchars, *nbytes;
  {
!   const unsigned char *endp = str + len;
    int n, chars = 0, bytes = 0;
  
    while (str < endp)