mirror/glibc
2
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2025-02-17 13:00:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
* 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.
This commit is contained in:
Roland McGrath 2000-03-20 18:09:38 +00:00
parent a6a478e9f9
commit 8600b1afb7
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
locale/programs/ld-collate.c
View File

@ -921,7 +921,7 @@ insert_value (struct linereader *ldfile, struct token *arg,
if (elem->next != NULL || (collate->cursor != NULL if (elem->next != NULL || (collate->cursor != NULL
&& elem->next == collate->cursor)) && 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, (int) arg->val.str.lenmb, arg->val.str.startmb,
elem->file, elem->line); elem->file, elem->line);
lr_ignore_rest (ldfile, 0); 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)) && elem->next == collate->cursor))
{ {
lr_error (ldfile, _("\ lr_error (ldfile, _("\
order for `%.*s' already defined at %s:%zu"), order for `%.*s' already defined at %s:%Zu"),
(int) namelen, seq->name, (int) namelen, seq->name,
elem->file, elem->line); elem->file, elem->line);
goto increment; goto increment;
@ -1228,7 +1228,7 @@ order for `%.*s' already defined at %s:%zu"),
&& elem->next == collate->cursor)) && elem->next == collate->cursor))
{ {
lr_error (ldfile, _("\ 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, "LC_COLLATE", (int) lenfrom, buf,
elem->file, elem->line); elem->file, elem->line);
continue; continue;
@ -3391,9 +3391,9 @@ error while adding equivalent collating symbol"));
&& collate->undefined.next == collate->cursor)) && collate->undefined.next == collate->cursor))
{ {
lr_error (ldfile, 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", "LC_COLLATE", 9, "UNDEFINED",
(int) collate->undefined.file, collate->undefined.file,
collate->undefined.line); collate->undefined.line);
lr_ignore_rest (ldfile, 0); lr_ignore_rest (ldfile, 0);
} }