From: Roland McGrath <roland@gnu.org>
Date: Mon, 20 Mar 2000 18:09:38 +0000 (+0000)
Subject: 2000-03-17  Roland McGrath  <roland@baalperazim.frob.com>
X-Git-Tag: cvs/glibc_2-1-91~853
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8600b1afb7c671aa85bc6868b627a3ab95963d24;p=platform%2Fupstream%2Fglibc.git

2000-03-17  Roland McGrath  <roland@baalperazim.frob.com>

	* locale/programs/ld-collate.c (collate_read): Remove bogus cast.
	(insert_value, handle_ellipsis, collate_read): Replace %zu in format
	strings with %Zu, because gcc-2.95.2's -Wformat knows about the latter
	but not the former.
---

diff --git a/locale/programs/ld-collate.c b/locale/programs/ld-collate.c
index dbe822b..aee98df 100644
--- a/locale/programs/ld-collate.c
+++ b/locale/programs/ld-collate.c
@@ -921,7 +921,7 @@ insert_value (struct linereader *ldfile, struct token *arg,
   if (elem->next != NULL || (collate->cursor != NULL
 			     && elem->next == collate->cursor))
     {
-      lr_error (ldfile, _("order for `%.*s' already defined at %s:%zu"),
+      lr_error (ldfile, _("order for `%.*s' already defined at %s:%Zu"),
 		(int) arg->val.str.lenmb, arg->val.str.startmb,
 		elem->file, elem->line);
       lr_ignore_rest (ldfile, 0);
@@ -1089,7 +1089,7 @@ sequence is not lower than that of the last character"), "LC_COLLATE");
 					     && elem->next == collate->cursor))
 		    {
 		      lr_error (ldfile, _("\
-order for `%.*s' already defined at %s:%zu"),
+order for `%.*s' already defined at %s:%Zu"),
 				(int) namelen, seq->name,
 				elem->file, elem->line);
 		      goto increment;
@@ -1228,7 +1228,7 @@ order for `%.*s' already defined at %s:%zu"),
 					     && elem->next == collate->cursor))
 		    {
 		      lr_error (ldfile, _("\
-%s: order for `%.*s' already defined at %s:%zu"),
+%s: order for `%.*s' already defined at %s:%Zu"),
 				"LC_COLLATE", (int) lenfrom, buf,
 				elem->file, elem->line);
 		      continue;
@@ -3391,9 +3391,9 @@ error while adding equivalent collating symbol"));
 		  && collate->undefined.next == collate->cursor))
 	    {
 	      lr_error (ldfile,
-			_("%s: order for `%.*s' already defined at %s:%zu"),
+			_("%s: order for `%.*s' already defined at %s:%Zu"),
 			"LC_COLLATE", 9, "UNDEFINED",
-			(int) collate->undefined.file,
+			collate->undefined.file,
 			collate->undefined.line);
 	      lr_ignore_rest (ldfile, 0);
 	    }