From: Bruno Haible <bruno@clisp.org>
Date: Mon, 22 Sep 2003 09:54:41 +0000 (+0000)
Subject: Mark some strings as c-format.
X-Git-Tag: v0.13~238
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bb56bff8bc10c6dbfca563cf3f1bb73323af764a;p=thirdparty%2Fgettext.git

Mark some strings as c-format.
---

diff --git a/gettext-tools/src/ChangeLog b/gettext-tools/src/ChangeLog
index 36641cdfd..a7fc053f5 100644
--- a/gettext-tools/src/ChangeLog
+++ b/gettext-tools/src/ChangeLog
@@ -1,3 +1,10 @@
+2003-09-14  Bruno Haible  <bruno@clisp.org>
+
+	* msgfmt.c (check_plural_eval): Mark some strings as c-format.
+	(msgfmt_add_message): Make static.
+	* po-lex.c (mbfile_getc, control_sequence): Mark some strings as
+	c-format.
+
 2003-09-18  Bruno Haible  <bruno@clisp.org>
 
 	* FILES: Update.
diff --git a/gettext-tools/src/msgfmt.c b/gettext-tools/src/msgfmt.c
index 3d7228004..9830701d1 100644
--- a/gettext-tools/src/msgfmt.c
+++ b/gettext-tools/src/msgfmt.c
@@ -784,16 +784,19 @@ check_plural_eval (struct expression *plural_expr,
 #if USE_SIGINFO
 # ifdef FPE_INTDIV
 	case FPE_INTDIV:
+	  /* xgettext: c-format */
 	  msg = _("plural expression can produce division by zero");
 	  break;
 # endif
 # ifdef FPE_INTOVF
 	case FPE_INTOVF:
+	  /* xgettext: c-format */
 	  msg = _("plural expression can produce integer overflow");
 	  break;
 # endif
 	default:
 #endif
+	  /* xgettext: c-format */
 	  msg = _("plural expression can produce arithmetic exceptions, possibly division by zero");
 	}
 
@@ -1414,7 +1417,7 @@ domain name \"%s\" not suitable as file name: will use prefix"), name);
 }
 
 
-void
+static void
 msgfmt_add_message (default_po_reader_ty *this,
 		    char *msgid,
 		    lex_pos_ty *msgid_pos,
diff --git a/gettext-tools/src/po-lex.c b/gettext-tools/src/po-lex.c
index afc8ac6cd..f3555403b 100644
--- a/gettext-tools/src/po-lex.c
+++ b/gettext-tools/src/po-lex.c
@@ -455,6 +455,7 @@ mbfile_getc (mbchar_t mbc, mbfile_t mbf)
 		  /* An invalid multibyte sequence was encountered.  */
 		  /* Return a single byte.  */
 		  if (signal_eilseq)
+		    /* xgettext: c-format */
 		    po_gram_error (_("invalid multibyte sequence"));
 		  bytes = 1;
 		  mbc->uc_valid = false;
@@ -483,6 +484,7 @@ mbfile_getc (mbchar_t mbc, mbfile_t mbf)
 		      if (ferror (mbf->fp))
 			goto eof;
 		      if (signal_eilseq)
+			/* xgettext: c-format */
 			po_gram_error (_("\
 incomplete multibyte sequence at end of file"));
 		      bytes = mbf->bufcount;
@@ -493,6 +495,7 @@ incomplete multibyte sequence at end of file"));
 		  if (c == '\n')
 		    {
 		      if (signal_eilseq)
+			/* xgettext: c-format */
 			po_gram_error (_("\
 incomplete multibyte sequence at end of line"));
 		      bytes = mbf->bufcount - 1;
@@ -844,6 +847,7 @@ control_sequence ()
       /* FIXME: \u and \U are not handled.  */
       }
   lex_ungetc (mbc);
+  /* xgettext: c-format */
   po_gram_error (_("invalid control sequence"));
   return ' ';
 }