oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

lib/wind: Canonical ordering can't use unstable sort

Browse Source
This commit is contained in:
Asanka Herath
2010-06-18 16:21:44 -04:00
parent 7af1f40258
commit 12909ec109
1 changed files with 25 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
lib/wind/normalize.c
View File

@@ -164,13 +164,32 @@ compat_decomp(const uint32_t *in, size_t in_len,
return 0;
}
static int
cc_cmp(const void *a, const void *b)
static void
swap_char(uint32_t * a, uint32_t * b)
{
const uint32_t *ua = (const uint32_t *)a;
const uint32_t *ub = (const uint32_t *)b;
uint32_t t;
t = *a;
*a = *b;
*b = t;
}
return _wind_combining_class(*ua) - _wind_combining_class(*ub);
/* Unicode 5.2.0 D109 Canonical Ordering for a sequence of code points
* that all have Canonical_Combining_Class > 0 */
static void
canonical_reorder_sequence(uint32_t * a, size_t len)
{
size_t i, j;
if (len <= 1)
return;
for (i = 1; i < len; i++) {
for (j = i;
j > 0 &&
_wind_combining_class(a[j]) < _wind_combining_class(a[j-1]);
j--)
swap_char(&a[j], &a[j-1]);
}
}
static void
@@ -186,7 +205,7 @@ canonical_reorder(uint32_t *tmp, size_t tmp_len)
j < tmp_len && _wind_combining_class(tmp[j]);
++j)
;
qsort(&tmp[i], j - i, sizeof(tmp[0]), cc_cmp);
canonical_reorder_sequence(&tmp[i], j - i);
i = j;
}
}