[Emacs-diffs] emacs/src ChangeLog coding.c coding.h

[Andreas Schwab]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Andreas Schwab <schwab> 09/02/22 15:48:04

Modified files:
        src            : ChangeLog coding.c coding.h 

Log message:
        * coding.h (struct coding_system): Make safe_charsets a pointer to
        unsigned char.
        * coding.c (CODING_ISO_REQUEST): Check for safe_charsets content
        being 255.
        (SAFE_CHARSET_P): Likewise.
        (setup_iso_safe_charsets): Properly setup safe_charsets.
        (Fdefine_coding_system_internal): Likewise.
        (setup_coding_system): Likewise.  Remove unneeded casts.
        (detect_coding_iso_2022): Compare Viso_2022_charset_list with
        CODING_ATTR_CHARSET_LIST, not CODING_ATTR_SAFE_CHARSETS.  Remove
        unneeded casts.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/ChangeLog?cvsroot=emacs&r1=1.7374&r2=1.7375
http://cvs.savannah.gnu.org/viewcvs/emacs/src/coding.c?cvsroot=emacs&r1=1.418&r2=1.419
http://cvs.savannah.gnu.org/viewcvs/emacs/src/coding.h?cvsroot=emacs&r1=1.94&r2=1.95

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/src/ChangeLog,v
retrieving revision 1.7374
retrieving revision 1.7375
diff -u -b -r1.7374 -r1.7375
--- ChangeLog   22 Feb 2009 14:29:25 -0000      1.7374
+++ ChangeLog   22 Feb 2009 15:48:02 -0000      1.7375
@@ -1,5 +1,17 @@
 2009-02-22  Andreas Schwab  <address@hidden>
 
+       * coding.h (struct coding_system): Make safe_charsets a pointer to
+       unsigned char.
+       * coding.c (CODING_ISO_REQUEST): Check for safe_charsets content
+       being 255.
+       (SAFE_CHARSET_P): Likewise.
+       (setup_iso_safe_charsets): Properly setup safe_charsets.
+       (Fdefine_coding_system_internal): Likewise.
+       (setup_coding_system): Likewise.  Remove unneeded casts.
+       (detect_coding_iso_2022): Compare Viso_2022_charset_list with
+       CODING_ATTR_CHARSET_LIST, not CODING_ATTR_SAFE_CHARSETS.  Remove
+       unneeded casts.
+
        * insdel.c (del_range_2): Don't modify gap contents when called
        from decode_coding_object.  (Bug#1809)
 

Index: coding.c
===================================================================
RCS file: /sources/emacs/emacs/src/coding.c,v
retrieving revision 1.418
retrieving revision 1.419
diff -u -b -r1.418 -r1.419
--- coding.c    19 Feb 2009 04:23:32 -0000      1.418
+++ coding.c    22 Feb 2009 15:48:03 -0000      1.419
@@ -433,8 +433,10 @@
 
 
 #define CODING_ISO_REQUEST(coding, charset_id) \
-  ((charset_id <= (coding)->max_charset_id     \
+  (((charset_id) <= (coding)->max_charset_id           \
+    ? ((coding)->safe_charsets[charset_id] != 255      \
     ? (coding)->safe_charsets[charset_id]      \
+       : -1)                                           \
     : -1))
 
 
@@ -2729,7 +2731,7 @@
 
 #define SAFE_CHARSET_P(coding, id)     \
   ((id) <= (coding)->max_charset_id    \
-   && (coding)->safe_charsets[id] >= 0)
+   && (coding)->safe_charsets[id] != 255)
 
 
 #define SHIFT_OUT_OK(category) \
@@ -2767,8 +2769,8 @@
        max_charset_id = id;
     }
 
-  safe_charsets = Fmake_string (make_number (max_charset_id + 1),
-                               make_number (255));
+  safe_charsets = make_uninit_string (max_charset_id + 1);
+  memset (SDATA (safe_charsets), 255, max_charset_id + 1);
   request = AREF (attrs, coding_attr_iso_request);
   reg_usage = AREF (attrs, coding_attr_iso_usage);
   reg94 = XINT (XCAR (reg_usage));
@@ -2832,11 +2834,11 @@
        continue;
       attrs = CODING_ID_ATTRS (this->id);
       if (CODING_ISO_FLAGS (this) & CODING_ISO_FLAG_FULL_SUPPORT
-         && ! EQ (CODING_ATTR_SAFE_CHARSETS (attrs), Viso_2022_charset_list))
+         && ! EQ (CODING_ATTR_CHARSET_LIST (attrs), Viso_2022_charset_list))
        setup_iso_safe_charsets (attrs);
       val = CODING_ATTR_SAFE_CHARSETS (attrs);
       this->max_charset_id = SCHARS (val) - 1;
-      this->safe_charsets = (char *) SDATA (val);
+      this->safe_charsets = SDATA (val);
     }
 
   /* A coding system of this category is always ASCII compatible.  */
@@ -3246,7 +3248,7 @@
   setup_iso_safe_charsets (attrs);
   /* Charset list may have been changed.  */
   charset_list = CODING_ATTR_CHARSET_LIST (attrs);
-  coding->safe_charsets = (char *) SDATA (CODING_ATTR_SAFE_CHARSETS(attrs));
+  coding->safe_charsets = SDATA (CODING_ATTR_SAFE_CHARSETS (attrs));
 
   while (1)
     {
@@ -4133,7 +4135,7 @@
   setup_iso_safe_charsets (attrs);
   /* Charset list may have been changed.  */
   charset_list = CODING_ATTR_CHARSET_LIST (attrs);
-  coding->safe_charsets = (char *) SDATA (CODING_ATTR_SAFE_CHARSETS(attrs));
+  coding->safe_charsets = SDATA (CODING_ATTR_SAFE_CHARSETS (attrs));
 
   ascii_compatible = ! NILP (CODING_ATTR_ASCII_COMPAT (attrs));
 
@@ -5414,7 +5416,7 @@
 
   val = CODING_ATTR_SAFE_CHARSETS (attrs);
   coding->max_charset_id = SCHARS (val) - 1;
-  coding->safe_charsets = (char *) SDATA (val);
+  coding->safe_charsets = SDATA (val);
   coding->default_char = XINT (CODING_ATTR_DEFAULT_CHAR (attrs));
 
   coding_type = CODING_ATTR_TYPE (attrs);
@@ -5459,7 +5461,7 @@
          setup_iso_safe_charsets (attrs);
          val = CODING_ATTR_SAFE_CHARSETS (attrs);
          coding->max_charset_id = SCHARS (val) - 1;
-         coding->safe_charsets = (char *) SDATA (val);
+         coding->safe_charsets = SDATA (val);
        }
       CODING_ISO_FLAGS (coding) = flags;
     }
@@ -5529,13 +5531,13 @@
               tail = XCDR (tail))
            if (max_charset_id < XFASTINT (XCAR (tail)))
              max_charset_id = XFASTINT (XCAR (tail));
-         safe_charsets = Fmake_string (make_number (max_charset_id + 1),
-                                       make_number (255));
+         safe_charsets = make_uninit_string (max_charset_id + 1);
+         memset (SDATA (safe_charsets), 255, max_charset_id + 1);
          for (tail = Vemacs_mule_charset_list; CONSP (tail);
               tail = XCDR (tail))
            SSET (safe_charsets, XFASTINT (XCAR (tail)), 0);
          coding->max_charset_id = max_charset_id;
-         coding->safe_charsets = (char *) SDATA (safe_charsets);
+         coding->safe_charsets = SDATA (safe_charsets);
        }
     }
   else if (EQ (coding_type, Qshift_jis))
@@ -9293,8 +9295,8 @@
     }
   CODING_ATTR_CHARSET_LIST (attrs) = charset_list;
 
-  safe_charsets = Fmake_string (make_number (max_charset_id + 1),
-                               make_number (255));
+  safe_charsets = make_uninit_string (max_charset_id + 1);
+  memset (SDATA (safe_charsets), 255, max_charset_id + 1);
   for (tail = charset_list; CONSP (tail); tail = XCDR (tail))
     SSET (safe_charsets, XFASTINT (XCAR (tail)), 0);
   CODING_ATTR_SAFE_CHARSETS (attrs) = safe_charsets;

Index: coding.h
===================================================================
RCS file: /sources/emacs/emacs/src/coding.h,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -b -r1.94 -r1.95
--- coding.h    4 Feb 2009 01:53:10 -0000       1.94
+++ coding.h    22 Feb 2009 15:48:04 -0000      1.95
@@ -391,7 +391,7 @@
     } spec;
 
   int max_charset_id;
-  char *safe_charsets;
+  unsigned char *safe_charsets;
 
   /* The following two members specify how binary 8-bit code 128..255
      are represented in source and destination text respectively.  1