Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
* de_DE.in: Adjust for correct handling of backward direction sorting.
  • Loading branch information
Ulrich Drepper committed Oct 2, 2007
1 parent 80e069e commit 33a667d
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 9 deletions.
4 changes: 4 additions & 0 deletions localedata/ChangeLog
@@ -1,3 +1,7 @@
2007-10-02 Ulrich Drepper <drepper@redhat.com>

* de_DE.in: Adjust for correct handling of backward direction sorting.

2007-10-01 Ulrich Drepper <drepper@redhat.com>

[BZ #4941]
Expand Down
6 changes: 3 additions & 3 deletions localedata/de_DE.in
Expand Up @@ -40,18 +40,18 @@ F
Fussel : fluff
fusseln : to wear of fluff
f��eln : play footsie [under the table]
fu�en : to be based [on]
F�ssen : F�ssen (town)
fu�en : to be based [on]
F��en (dat. pl. of "Fu�") : [to the] feet
in Massen : in large numbers
in Ma�en : moderately
Masern : measels
Mass. (Massachusetts) : Massachusetts (state)
Ma� : measure
Masse : mass
Mass� : (particular billard stroke)
Ma�e (pl. of "Ma�") : measures
m��e (pres. conj. of "messen") : take measure (e.g. in indirect speech)
Mass� : (particular billard stroke)
Massen- : mass; wholesale; bulk (in compound nouns)
massig : massive
m��ig : moderate; modest
Expand All @@ -60,8 +60,8 @@ Mi
Passe : yoke (of dress)
pass� : over, gone
Schlagerforderung : claim, demanded in a pop song
Schlagerf�rderung : promotion of pop music
Schl�gerforderung : demand of a hooligan
Schlagerf�rderung : promotion of pop music
Schl�gerf�rderung : promotion of hooliganism :-)
Schurz : apron
Sch�rze : apron
Expand Down
24 changes: 18 additions & 6 deletions string/strcoll_l.c
@@ -1,4 +1,4 @@
/* Copyright (C) 1995,96,97,2002, 2004 Free Software Foundation, Inc.
/* Copyright (C) 1995,96,97,2002, 2004, 2007 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Written by Ulrich Drepper <drepper@gnu.org>, 1995.
Expand Down Expand Up @@ -128,7 +128,7 @@ STRCOLL (s1, s2, l)
Please note that the localedef programs makes sure that `position'
is not used at the first level. */
if (! __libc_use_alloca (s1len + s2len))
if (! __libc_use_alloca ((s1len + s2len) * (sizeof (int32_t) + 1)))
{
idx1arr = (int32_t *) malloc ((s1len + s2len) * (sizeof (int32_t) + 1));
idx2arr = &idx1arr[s1len];
Expand Down Expand Up @@ -186,7 +186,10 @@ STRCOLL (s1, s2, l)
/* The last pushed character was handled. Continue
with forward characters. */
if (idx1cnt < idx1max)
idx1now = idx1cnt;
{
idx1now = idx1cnt;
backw1_stop = ~0ul;
}
else
/* Nothing anymore. The backward sequence ended with
the last sequence in the string. Note that seq1len
Expand Down Expand Up @@ -245,7 +248,10 @@ STRCOLL (s1, s2, l)
/* The last pushed character was handled. Continue
with forward characters. */
if (idx2cnt < idx2max)
idx2now = idx2cnt;
{
idx2now = idx2cnt;
backw2_stop = ~0ul;
}
else
/* Nothing anymore. The backward sequence ended with
the last sequence in the string. Note that seq2len
Expand Down Expand Up @@ -370,7 +376,10 @@ STRCOLL (s1, s2, l)
/* The last pushed character was handled. Continue
with forward characters. */
if (idx1cnt < idx1max)
idx1now = idx1cnt;
{
idx1now = idx1cnt;
backw1_stop = ~0ul;
}
else
{
/* Nothing anymore. The backward sequence
Expand Down Expand Up @@ -426,7 +435,10 @@ STRCOLL (s1, s2, l)
/* The last pushed character was handled. Continue
with forward characters. */
if (idx2cnt < idx2max)
idx2now = idx2cnt;
{
idx2now = idx2cnt;
backw2_stop = ~0ul;
}
else
{
/* Nothing anymore. The backward sequence
Expand Down

0 comments on commit 33a667d

Please sign in to comment.