From: Bruno Haible <bruno@clisp.org>
Date: Mon, 15 Dec 2003 14:13:22 +0000 (+0000)
Subject: Tweak an error message.
X-Git-Tag: v0.13.1~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=31d3d646073ddf7ca1ee821e62951edafba52898;p=thirdparty%2Fgettext.git

Tweak an error message.
---

diff --git a/gettext-tools/src/ChangeLog b/gettext-tools/src/ChangeLog
index c786bf3cf..43b2b4b03 100644
--- 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 d38bc6aad..5d5e092a5 100644
--- 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 04a61c33b..fd3d5c298 100644
--- 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) == '\\')