[Emacs-diffs] /srv/bzr/emacs/trunk r103121: Merge: * xdisp.c: conform to C89 pointer rules

[Paul Eggert]

------------------------------------------------------------
revno: 103121 [merge]
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Sat 2011-02-05 01:27:17 -0800
message:
  Merge: * xdisp.c: conform to C89 pointer rules
modified:
  src/ChangeLog
  src/xdisp.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-02-05 05:48:19 +0000
+++ b/src/ChangeLog     2011-02-05 09:26:46 +0000
@@ -1,5 +1,13 @@
 2011-02-05  Paul Eggert  <address@hidden>
 
+       * xdisp.c: conform to C89 pointer rules
+       (store_mode_line_noprop, display_string, reseat_to_string):
+       (c_string_pos, number_of_chars, message_dolog):
+       (message_log_check_duplicate, set_message_1, store_mode_line_noprop):
+       (display_mode_element, display_string):
+       Switch between char * and unsigned char * to stay compatible wth
+       C89 pointer rules.
+
        * regex.c: conform to C89 pointer rules
        (re_wctype): Add cast, as C89 does not allow assigning between
        char * and unsigned char *.

=== modified file 'src/xdisp.c'
--- a/src/xdisp.c       2011-01-30 22:17:44 +0000
+++ b/src/xdisp.c       2011-02-05 09:26:46 +0000
@@ -773,7 +773,7 @@
 static int text_outside_line_unchanged_p (struct window *,
                                          EMACS_INT, EMACS_INT);
 static void store_mode_line_noprop_char (char);
-static int store_mode_line_noprop (const unsigned char *, int, int);
+static int store_mode_line_noprop (const char *, int, int);
 static void handle_stop (struct it *);
 static void handle_stop_backwards (struct it *, EMACS_INT);
 static int single_display_spec_intangible_p (Lisp_Object);
@@ -831,7 +831,7 @@
 static void display_menu_bar (struct window *);
 static int display_count_lines (EMACS_INT, EMACS_INT, EMACS_INT, int,
                                EMACS_INT *);
-static int display_string (const unsigned char *, Lisp_Object, Lisp_Object,
+static int display_string (const char *, Lisp_Object, Lisp_Object,
                            EMACS_INT, EMACS_INT, struct it *, int, int, int, 
int);
 static void compute_line_metrics (struct it *);
 static void run_redisplay_end_trigger_hook (struct it *);
@@ -854,7 +854,7 @@
 static void load_overlay_strings (struct it *, EMACS_INT);
 static int init_from_display_pos (struct it *, struct window *,
                                   struct display_pos *);
-static void reseat_to_string (struct it *, const unsigned char *,
+static void reseat_to_string (struct it *, const char *,
                               Lisp_Object, EMACS_INT, EMACS_INT, int, int);
 static enum move_it_result
        move_it_in_display_line_to (struct it *, EMACS_INT, int,
@@ -869,8 +869,8 @@
 static struct text_pos string_pos_nchars_ahead (struct text_pos,
                                                 Lisp_Object, EMACS_INT);
 static struct text_pos string_pos (EMACS_INT, Lisp_Object);
-static struct text_pos c_string_pos (EMACS_INT, const unsigned char *, int);
-static EMACS_INT number_of_chars (const unsigned char *, int);
+static struct text_pos c_string_pos (EMACS_INT, const char *, int);
+static EMACS_INT number_of_chars (const char *, int);
 static void compute_stop_pos (struct it *);
 static void compute_string_pos (struct text_pos *, struct text_pos,
                                 Lisp_Object);
@@ -1383,7 +1383,7 @@
    means recognize multibyte characters.  */
 
 static struct text_pos
-c_string_pos (EMACS_INT charpos, const unsigned char *s, int multibyte_p)
+c_string_pos (EMACS_INT charpos, const char *s, int multibyte_p)
 {
   struct text_pos pos;
 
@@ -1397,7 +1397,7 @@
       SET_TEXT_POS (pos, 0, 0);
       while (charpos--)
        {
-         string_char_and_length (s, &len);
+         string_char_and_length ((const unsigned char *) s, &len);
          s += len;
          CHARPOS (pos) += 1;
          BYTEPOS (pos) += len;
@@ -1414,7 +1414,7 @@
    non-zero means recognize multibyte characters.  */
 
 static EMACS_INT
-number_of_chars (const unsigned char *s, int multibyte_p)
+number_of_chars (const char *s, int multibyte_p)
 {
   EMACS_INT nchars;
 
@@ -1422,7 +1422,7 @@
     {
       EMACS_INT rest = strlen (s);
       int len;
-      unsigned char *p = (unsigned char *) s;
+      const unsigned char *p = (const unsigned char *) s;
 
       for (nchars = 0; rest > 0; ++nchars)
        {
@@ -3172,7 +3172,7 @@
       specbind (Qfontification_functions, Qnil);
 
       xassert (it->end_charpos == ZV);
-      
+
       if (!CONSP (val) || EQ (XCAR (val), Qlambda))
        safe_call1 (val, pos);
       else
@@ -3218,7 +3218,7 @@
         as is/was done in grep.el where some escapes sequences are turned
         into face properties (bug#7876).  */
       it->end_charpos = ZV;
-      
+
       /* Return HANDLED_RECOMPUTE_PROPS only if function fontified
         something.  This avoids an endless loop if they failed to
         fontify the text for which reason ever.  */
@@ -5442,7 +5442,7 @@
    calling this function.  */
 
 static void
-reseat_to_string (struct it *it, const unsigned char *s, Lisp_Object string,
+reseat_to_string (struct it *it, const char *s, Lisp_Object string,
                  EMACS_INT charpos, EMACS_INT precision, int field_width,
                  int multibyte)
 {
@@ -5474,7 +5474,7 @@
     }
   else
     {
-      it->s = s;
+      it->s = (const unsigned char *) s;
       it->string = Qnil;
 
       /* Note that we use IT->current.pos, not it->current.string_pos,
@@ -7884,6 +7884,8 @@
 void
 message_dolog (const char *m, EMACS_INT nbytes, int nlflag, int multibyte)
 {
+  const unsigned char *msg = (const unsigned char *) m;
+
   if (!NILP (Vmemory_full))
     return;
 
@@ -7934,7 +7936,7 @@
             for the *Message* buffer.  */
          for (i = 0; i < nbytes; i += char_bytes)
            {
-             c = string_char_and_length (m + i, &char_bytes);
+             c = string_char_and_length (msg + i, &char_bytes);
              work[0] = (ASCII_CHAR_P (c)
                         ? c
                         : multibyte_char_to_unibyte (c, Qnil));
@@ -7946,7 +7948,6 @@
        {
          EMACS_INT i;
          int c, char_bytes;
-         unsigned char *msg = (unsigned char *) m;
          unsigned char str[MAX_MULTIBYTE_LENGTH];
          /* Convert a single-byte string to multibyte
             for the *Message* buffer.  */
@@ -7959,13 +7960,13 @@
            }
        }
       else if (nbytes)
-       insert_1 (m, nbytes, 1, 0, 0);
+       insert_1 (msg, nbytes, 1, 0, 0);
 
       if (nlflag)
        {
          EMACS_INT this_bol, this_bol_byte, prev_bol, prev_bol_byte;
          int dup;
-         insert_1 ("\n", 1, 1, 0, 0);
+         insert_1 ((const unsigned char *) "\n", 1, 1, 0, 0);
 
          scan_newline (Z, Z_BYTE, BEG, BEG_BYTE, -2, 0);
          this_bol = PT;
@@ -7995,7 +7996,7 @@
                      sprintf (dupstr, " [%d times]", dup);
                      duplen = strlen (dupstr);
                      TEMP_SET_PT_BOTH (Z - 1, Z_BYTE - 1);
-                     insert_1 (dupstr, duplen, 1, 0, 1);
+                     insert_1 ((unsigned char *) dupstr, duplen, 1, 0, 1);
                    }
                }
            }
@@ -8079,7 +8080,7 @@
       int n = 0;
       while (*p1 >= '0' && *p1 <= '9')
        n = n * 10 + *p1++ - '0';
-      if (strncmp (p1, " times]\n", 8) == 0)
+      if (strncmp ((char *) p1, " times]\n", 8) == 0)
        return n+1;
     }
   return 0;
@@ -9154,6 +9155,7 @@
 set_message_1 (EMACS_INT a1, Lisp_Object a2, EMACS_INT nbytes, EMACS_INT 
multibyte_p)
 {
   const char *s = (const char *) a1;
+  const unsigned char *msg = (const unsigned char *) s;
   Lisp_Object string = a2;
 
   /* Change multibyteness of the echo buffer appropriately.  */
@@ -9196,7 +9198,7 @@
          /* Convert a multibyte string to single-byte.  */
          for (i = 0; i < nbytes; i += n)
            {
-             c = string_char_and_length (s + i, &n);
+             c = string_char_and_length (msg + i, &n);
              work[0] = (ASCII_CHAR_P (c)
                         ? c
                         : multibyte_char_to_unibyte (c, Qnil));
@@ -9209,7 +9211,6 @@
          /* Convert from single-byte to multi-byte.  */
          EMACS_INT i;
          int c, n;
-         const unsigned char *msg = (const unsigned char *) s;
          unsigned char str[MAX_MULTIBYTE_LENGTH];
 
          /* Convert a single-byte string to multibyte.  */
@@ -9222,7 +9223,7 @@
            }
        }
       else
-       insert_1 (s, nbytes, 1, 0, 0);
+       insert_1 (msg, nbytes, 1, 0, 0);
     }
 
   return 0;
@@ -9517,7 +9518,7 @@
 
 
 /* Store part of a frame title in mode_line_noprop_buf, beginning at
-   mode_line_noprop_ptr.  STR is the string to store.  Do not copy
+   mode_line_noprop_ptr.  STRING is the string to store.  Do not copy
    characters that yield more columns than PRECISION; PRECISION <= 0
    means copy the whole string.  Pad with spaces until FIELD_WIDTH
    number of characters have been copied; FIELD_WIDTH <= 0 means don't
@@ -9525,13 +9526,14 @@
    frame title.  */
 
 static int
-store_mode_line_noprop (const unsigned char *str, int field_width, int 
precision)
+store_mode_line_noprop (const char *string, int field_width, int precision)
 {
+  const unsigned char *str = (const unsigned char *) string;
   int n = 0;
   EMACS_INT dummy, nbytes;
 
   /* Copy at most PRECISION chars from STR.  */
-  nbytes = strlen (str);
+  nbytes = strlen (string);
   n += c_string_width (str, nbytes, precision, &dummy, &nbytes);
   while (nbytes--)
     store_mode_line_noprop_char (*str++);
@@ -18396,7 +18398,7 @@
              {
              case MODE_LINE_NOPROP:
              case MODE_LINE_TITLE:
-               n += store_mode_line_noprop (SDATA (elt), -1, prec);
+               n += store_mode_line_noprop (SSDATA (elt), -1, prec);
                break;
              case MODE_LINE_STRING:
                n += store_mode_line_string (NULL, elt, 1, 0, prec, Qnil);
@@ -18440,7 +18442,7 @@
                  {
                  case MODE_LINE_NOPROP:
                  case MODE_LINE_TITLE:
-                   n += store_mode_line_noprop (SDATA (elt) + last_offset, 0, 
prec);
+                   n += store_mode_line_noprop (SSDATA (elt) + last_offset, 0, 
prec);
                    break;
                  case MODE_LINE_STRING:
                    {
@@ -18495,7 +18497,7 @@
                  {
                    int multibyte;
                    EMACS_INT bytepos, charpos;
-                   const unsigned char *spec;
+                   const char *spec;
                    Lisp_Object string;
 
                    bytepos = percent_position;
@@ -19746,7 +19748,7 @@
    Value is the number of columns displayed.  */
 
 static int
-display_string (const unsigned char *string, Lisp_Object lisp_string, 
Lisp_Object face_string,
+display_string (const char *string, Lisp_Object lisp_string, Lisp_Object 
face_string,
                EMACS_INT face_string_pos, EMACS_INT start, struct it *it,
                int field_width, int precision, int max_x, int multibyte)
 {