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

[fcxml] Don't allocate attr array if there are no attributes 

Reduces number of mallocs from FcConfigSaveAttr() in my small test
from over 900 down to 157.
This commit is contained in:
Behdad Esfahbod 2009-03-12 09:27:20 -04:00
parent 3ed70071cd
commit 532d8a1dbc
1 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/fcxml.c
View File

@ -939,9 +939,14 @@ FcConfigSaveAttr (const XML_Char **attr)
slen = 0; slen = 0;
for (i = 0; attr[i]; i++) for (i = 0; attr[i]; i++)
slen += strlen ((char *) attr[i]) + 1; slen += strlen ((char *) attr[i]) + 1;
if (i == 0)
return 0;
new = malloc ((i + 1) * sizeof (FcChar8 *) + slen); new = malloc ((i + 1) * sizeof (FcChar8 *) + slen);
if (!new) if (!new)
{
FcConfigMessage (0, FcSevereError, "out of memory");
return 0; return 0;
}
FcMemAlloc (FC_MEM_ATTR, 1); /* size is too expensive */ FcMemAlloc (FC_MEM_ATTR, 1); /* size is too expensive */
s = (FcChar8 *) (new + (i + 1)); s = (FcChar8 *) (new + (i + 1));
for (i = 0; attr[i]; i++) for (i = 0; attr[i]; i++)
@ -964,19 +969,7 @@ FcPStackPush (FcConfigParse *parse, FcElement element, const XML_Char **attr)
FcMemAlloc (FC_MEM_PSTACK, sizeof (FcPStack)); FcMemAlloc (FC_MEM_PSTACK, sizeof (FcPStack));
new->prev = parse->pstack; new->prev = parse->pstack;
new->element = element; new->element = element;
if (attr)
{
new->attr = FcConfigSaveAttr (attr); new->attr = FcConfigSaveAttr (attr);
if (!new->attr)
{
FcConfigMessage (parse, FcSevereError, "out of memory");
FcMemFree (FC_MEM_PSTACK, sizeof (FcPStack));
free (new);
return FcFalse;
}
}
else
new->attr = 0;
FcStrBufInit (&new->str, 0, 0); FcStrBufInit (&new->str, 0, 0);
parse->pstack = new; parse->pstack = new;
return FcTrue; return FcTrue;