Tweak an error message.

diff --git a/gettext-tools/src/ChangeLog b/gettext-tools/src/ChangeLog
index c786bf3cf8c48d05fee1881ae7cf6b96e41fd912..43b2b4b031a795d169b478fc92362751446da56e 100644 (file)
--- a/gettext-tools/src/ChangeLog
+++ b/gettext-tools/src/ChangeLog
@@ -1,3 +1,8 @@
+2003-12-14  Bruno Haible  <bruno@clisp.org>
+
+       * x-c.c (phase7_getc): Remove dead code.
+       * x-java.c (accumulate_escaped): More precise error message.
+
 2003-12-02  Bruno Haible  <bruno@clisp.org>
 
        * msginit.c (catalogname_for_locale): Treat sr_CS like sr_YU.

diff --git a/gettext-tools/src/x-c.c b/gettext-tools/src/x-c.c
index d38bc6aadca5f7ac79facb0299ce2c30dc486be3..5d5e092a5ec8d7aac744834942825bbcb71b2b98 100644 (file)
--- a/gettext-tools/src/x-c.c
+++ b/gettext-tools/src/x-c.c
@@ -817,7 +817,6 @@ phase7_getc ()
            default:
              phase3_ungetc (c);
              return n;
-             break;
 
            case '0': case '1': case '2': case '3': case '4':
            case '5': case '6': case '7': case '8': case '9':

diff --git a/gettext-tools/src/x-java.c b/gettext-tools/src/x-java.c
index 04a61c33b75eee58fcda61c8f147585a35946cb6..fd3d5c29801734bdc0c5e703fe66d1c1912ec32c 100644 (file)
--- a/gettext-tools/src/x-java.c
+++ b/gettext-tools/src/x-java.c
@@ -897,11 +897,15 @@ accumulate_escaped (struct string_buffer *literal, int delimiter)
        break;
       if (RED (c) == '\n')
        {
+         phase3_ungetc (c);
          error_with_progname = false;
-         error (0, 0, _("%s:%d: warning: unterminated character constant"),
-                logical_file_name, line_number - 1);
+         if (delimiter == '\'')
+           error (0, 0, _("%s:%d: warning: unterminated character constant"),
+                  logical_file_name, line_number);
+         else
+           error (0, 0, _("%s:%d: warning: unterminated string constant"),
+                  logical_file_name, line_number);
          error_with_progname = true;
-         phase3_ungetc (c);
          break;
        }
       if (RED (c) == '\\')