From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sat, 26 May 2012 08:30:49 +0000 (-0700)
Subject: * lread.c (read1): Simplify slightly to avoid an overflow warning
X-Git-Tag: emacs-24.2.90~471^2~6^2~101
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=4cfd81f6c9755fb87eaf9f529c2bcbb0a30edfcf;p=emacs.git

* lread.c (read1): Simplify slightly to avoid an overflow warning

with GCC 4.7.0 on x86-64.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index acae070f068..2981e754c8a 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2012-05-26  Paul Eggert  <eggert@cs.ucla.edu>
+
+	* lread.c (read1): Simplify slightly to avoid an overflow warning
+	with GCC 4.7.0 on x86-64.
+
 2012-05-26  Eli Zaretskii  <eliz@gnu.org>
 
 	* bidi.c (bidi_mirror_char): Revert last change: an int is
diff --git a/src/lread.c b/src/lread.c
index 80250cfcb1c..7aba203d685 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -2986,19 +2986,14 @@ read1 (register Lisp_Object readcharfun, int *pch, int first_in_list)
 	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