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 8b46953478e2cef71ae3ad115667ffd9586a421f..5be4e4432372cebd497c0e0271248e3c9f7d272a 100644 (file)
--- 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 5ce6f49345cae35de001a37f4dde92d2c4f933a2..001cfd91d6df4a94049038b345ca2e13c00faa8b 100644 (file)
--- 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');