Skip to content

Commit

Permalink
[BZ #3745]
Browse files Browse the repository at this point in the history
	* locale/programs/ld-collate.c (handle_ellipsis): Fix generation
	of names for ellipsises.
  • Loading branch information
Ulrich Drepper committed Feb 17, 2007
1 parent 07fb518 commit 5e9e9c1
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 4 deletions.
4 changes: 4 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
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]
* malloc/memusage.sh: Cleanups.
* debug/xtrace.sh: Quoting and trap changes.
Expand Down
8 changes: 4 additions & 4 deletions locale/programs/ld-collate.c
Original file line number Diff line number Diff line change
@@ -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.
Contributed by Ulrich Drepper <drepper@gnu.org>, 1995.
Expand Down Expand Up @@ -1330,8 +1330,9 @@ order for `%.*s' already defined at %s:%Zu"),
uint32_t wc;
int cnt;

/* Generate the the name. */
sprintf (buf + preflen, base == 10 ? "%ld" : "%lX", from);
/* Generate the name. */
sprintf (buf + preflen, base == 10 ? "%0*ld" : "%0*lX",
(int) (lenfrom - preflen), from);

/* Look whether this name is already defined. */
void *ptr;
Expand Down Expand Up @@ -3571,7 +3572,6 @@ error while adding equivalent collating symbol"));

if (was_ellipsis != tok_none)
{

handle_ellipsis (ldfile, symstr, symlen, was_ellipsis,
charmap, repertoire, result);

Expand Down

0 comments on commit 5e9e9c1

Please sign in to comment.