qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[BZ #3745] 

* locale/programs/ld-collate.c (handle_ellipsis): Fix generation
	of names for ellipsises.
This commit is contained in:
Ulrich Drepper 2007-02-17 16:53:41 +00:00
parent 07fb518573
commit 5e9e9c1472
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,5 +1,9 @@
2007-02-17 Ulrich Drepper <drepper@redhat.com> 2007-02-17 Ulrich Drepper <drepper@redhat.com>
[BZ #3745]
* locale/programs/ld-collate.c (handle_ellipsis): Fix generation
of names for ellipsises.
[BZ #3348] [BZ #3348]
* malloc/memusage.sh: Cleanups. * malloc/memusage.sh: Cleanups.
* debug/xtrace.sh: Quoting and trap changes. * debug/xtrace.sh: Quoting and trap changes.

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

@ -1,4 +1,4 @@
/* Copyright (C) 1995-2002, 2003, 2005, 2006 Free Software Foundation, Inc. /* Copyright (C) 1995-2003, 2005, 2006, 2007 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@gnu.org>, 1995. Contributed by Ulrich Drepper <drepper@gnu.org>, 1995.
@ -1330,8 +1330,9 @@ order for `%.*s' already defined at %s:%Zu"),
uint32_t wc; uint32_t wc;
int cnt; int cnt;
/* Generate the the name. */ /* Generate the name. */
sprintf (buf + preflen, base == 10 ? "%ld" : "%lX", from); sprintf (buf + preflen, base == 10 ? "%0*ld" : "%0*lX",
(int) (lenfrom - preflen), from);
/* Look whether this name is already defined. */ /* Look whether this name is already defined. */
void *ptr; void *ptr;
@ -3571,7 +3572,6 @@ error while adding equivalent collating symbol"));
if (was_ellipsis != tok_none) if (was_ellipsis != tok_none)
{ {
handle_ellipsis (ldfile, symstr, symlen, was_ellipsis, handle_ellipsis (ldfile, symstr, symlen, was_ellipsis,
charmap, repertoire, result); charmap, repertoire, result);