FcObjectPtr i = 0, n;
const FcObjectTypeList *l;
FcObjectType *t = _FcUserObjectNames;
+ FcBool replace;
for (l = _FcObjectTypes; l; l = l->next)
{
t = (FcObjectType *)&l->types[i];
if (!strcmp (object, t->object))
{
- if (l == (FcObjectTypeList*)_FcUserObjectNames)
+ if (l->types == _FcUserObjectNames)
return -i;
else
return l->basic_offset + i;
break;
}
+ replace = l && l->types == _FcUserObjectNames;
if (!_FcUserObjectNames ||
- (l && l->types == _FcUserObjectNames && user_obj_alloc < l->ntypes))
+ (replace && user_obj_alloc <= l->ntypes))
{
int nt = user_obj_alloc + 4;
- FcObjectType * t = realloc (_FcUserObjectNames,
+ FcObjectType * tt = realloc (_FcUserObjectNames,
nt * sizeof (FcObjectType));
- if (!t)
+ if (!tt)
return 0;
- _FcUserObjectNames = t;
+ _FcUserObjectNames = tt;
user_obj_alloc = nt;
}
- if (l && l->types == _FcUserObjectNames)
+ if (replace)
{
n = l->ntypes;
FcNameUnregisterObjectTypesFree (l->types, l->ntypes, FcFalse);
FcNameRegisterObjectTypes (_FcUserObjectNames, n+1);
- for (l = _FcObjectTypes; l; l = l->next)
- {
- if (l->types == _FcUserObjectNames)
- {
- t = (FcObjectType *)l->types;
- break;
- }
- }
-
- if (!t)
+ if (!_FcUserObjectNames)
return 0;
- t[n].object = object;
- t[n].type = FcTypeVoid;
+ _FcUserObjectNames[n].object = object;
+ _FcUserObjectNames[n].type = FcTypeVoid;
return -n;
}
int i;
char * bp = (char *)block_ptr;
FcObjectType * bn;
- FcObjectTypeList * bnl;
bn = malloc (sizeof (const FcObjectType) * (new_biggest + 1));
if (!bn)
return 0;
- bnl = malloc (sizeof (FcObjectTypeList));
- if (!bnl)
- {
- free (bn);
- return 0;
- }
-
for (i = 0; i < new_biggest; i++)
{
const FcObjectType * t = FcNameGetObjectType(bp);