walkero
/
fontconfig
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix conf.d directory sorting. 

Sort was using broken comparison function.
This commit is contained in:
Keith Packard 2006-09-09 21:21:01 -07:00
parent 248b5903b7
commit 9419bb34f6
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/fcxml.c
View File

@ -2281,6 +2281,14 @@ FcEndDoctypeDecl (void *userData)
#endif /* ENABLE_LIBXML2 */ #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 static FcBool
FcConfigParseAndLoadDir (FcConfig *config, FcConfigParseAndLoadDir (FcConfig *config,
const FcChar8 *name, const FcChar8 *name,
@ -2350,7 +2358,7 @@ FcConfigParseAndLoadDir (FcConfig *config,
{ {
int i; int i;
qsort (files->strs, files->num, sizeof (FcChar8 *), 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++) for (i = 0; ret && i < files->num; i++)
ret = FcConfigParseAndLoad (config, files->strs[i], complain); ret = FcConfigParseAndLoad (config, files->strs[i], complain);
} }