From: Daiki Ueno <ueno@gnu.org>
Date: Tue, 2 Dec 2014 11:43:28 +0000 (+0900)
Subject: c: Minor cleanup of the previous commit
X-Git-Tag: v0.19.4~47
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4bbcb6674366b8ba0c9565b6ae40c2c8f40ccc39;p=thirdparty%2Fgettext.git

c: Minor cleanup of the previous commit

* x-c.c (phase5_get): Remove redundant check of is_prefix; fit
lines to 80 column.
---

diff --git a/gettext-tools/src/ChangeLog b/gettext-tools/src/ChangeLog
index 8b4695347..5be4e4432 100644
--- a/gettext-tools/src/ChangeLog
+++ b/gettext-tools/src/ChangeLog
@@ -1,3 +1,9 @@
+2014-12-02  Daiki Ueno  <ueno@gnu.org>
+
+	c: Minor cleanup of the previous commit
+	* x-c.c (phase5_get): Remove redundant check of is_prefix; fit
+	lines to 80 column.
+
 2014-12-02  Daiki Ueno  <ueno@gnu.org>
 
 	c: Support C++11 string literals
diff --git a/gettext-tools/src/x-c.c b/gettext-tools/src/x-c.c
index 5ce6f4934..001cfd91d 100644
--- a/gettext-tools/src/x-c.c
+++ b/gettext-tools/src/x-c.c
@@ -1218,7 +1218,7 @@ phase5_get (token_ty *tp)
 
                   if (is_prefix)
                     {
-                      raw_expected = is_prefix && buffer[bufpos - 1] == 'R';
+                      raw_expected = buffer[bufpos - 1] == 'R';
                       bufpos = 0;
                       goto string;
                     }
@@ -1386,7 +1386,8 @@ phase5_get (token_ty *tp)
                 if (c == '\n' && !raw_expected)
                   {
                     error_with_progname = false;
-                    error (0, 0, _("%s:%d: warning: unterminated string literal"),
+                    error (0, 0,
+                           _("%s:%d: warning: unterminated string literal"),
                            logical_file_name, line_number - 1);
                     error_with_progname = true;
                     phase3_ungetc ('\n');