ld-collate.c warning fixes
Roland McGrath
roland@frob.com
Fri Mar 17 12:41:00 GMT 2000
This patch avoids an ugly raft of compiler warnings (I'm using gcc-2.95.2).
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.
Index: locale/programs/ld-collate.c
===================================================================
RCS file: /cvs/glibc/libc/locale/programs/ld-collate.c,v
retrieving revision 1.64
diff -u -b -p -r1.64 ld-collate.c
--- ld-collate.c 2000/03/15 03:28:54 1.64
+++ ld-collate.c 2000/03/17 20:39:55
@@ -921,7 +921,7 @@ insert_value (struct linereader *ldfile,
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 l
&& 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:%
&& 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
&& 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);
}
More information about the Libc-hacker
mailing list