[Emacs-diffs] /srv/bzr/emacs/trunk r108375: * lread.c (read1): Simplify slightly to avoid an overflow warning

[Paul Eggert]

------------------------------------------------------------
revno: 108375
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Sat 2012-05-26 01:30:49 -0700
message:
  * lread.c (read1): Simplify slightly to avoid an overflow warning
  
  with GCC 4.7.0 on x86-64.
modified:
  src/ChangeLog
  src/lread.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-05-26 07:03:39 +0000
+++ b/src/ChangeLog     2012-05-26 08:30:49 +0000
@@ -1,3 +1,8 @@
+2012-05-26  Paul Eggert  <address@hidden>
+
+       * lread.c (read1): Simplify slightly to avoid an overflow warning
+       with GCC 4.7.0 on x86-64.
+
 2012-05-26  Eli Zaretskii  <address@hidden>
 
        * bidi.c (bidi_mirror_char): Revert last change: an int is

=== modified file 'src/lread.c'
--- a/src/lread.c       2012-05-25 19:27:58 +0000
+++ b/src/lread.c       2012-05-26 08:30:49 +0000
@@ -2986,19 +2986,14 @@
        if (!NILP (Vpurify_flag) && NILP (Vdoc_file_name) && cancel)
          return make_number (0);
 
-       if (force_multibyte)
-         /* READ_BUFFER already contains valid multibyte forms.  */
-         ;
-       else if (force_singlebyte)
+       if (! force_multibyte && force_singlebyte)
          {
+           /* READ_BUFFER contains raw 8-bit bytes and no multibyte
+              forms.  Convert it to unibyte.  */
            nchars = str_as_unibyte ((unsigned char *) read_buffer,
                                     p - read_buffer);
            p = read_buffer + nchars;
          }
-       else
-         {
-           /* Otherwise, READ_BUFFER contains only ASCII.  */
-         }
 
        return make_specified_string (read_buffer, nchars, p - read_buffer,
                                      (force_multibyte