From 9419bb34f6eac685fcf957faf6a38a5cdfa811d9 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Sat, 9 Sep 2006 21:21:01 -0700 Subject: [PATCH] Fix conf.d directory sorting. Sort was using broken comparison function. --- src/fcxml.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/fcxml.c b/src/fcxml.c index 4087183..a9453eb 100644 --- a/src/fcxml.c +++ b/src/fcxml.c @@ -2281,6 +2281,14 @@ FcEndDoctypeDecl (void *userData) #endif /* ENABLE_LIBXML2 */ +static int +FcSortCmpStr (const void *a, const void *b) +{ + const FcChar8 *as = *((FcChar8 **) a); + const FcChar8 *bs = *((FcChar8 **) b); + return FcStrCmp (as, bs); +} + static FcBool FcConfigParseAndLoadDir (FcConfig *config, const FcChar8 *name, @@ -2350,7 +2358,7 @@ FcConfigParseAndLoadDir (FcConfig *config, { int i; qsort (files->strs, files->num, sizeof (FcChar8 *), - (int (*)(const void *, const void *)) FcStrCmp); + (int (*)(const void *, const void *)) FcSortCmpStr); for (i = 0; ret && i < files->num; i++) ret = FcConfigParseAndLoad (config, files->strs[i], complain); } -- 2.39.2