mirrors/foot
1
0
Fork 0
mirror of https://codeberg.org/dnkl/foot.git synced 2026-03-13 05:33:51 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

font: font_from_name() returns an allocated font struct

Browse source
This commit is contained in:
Daniel Eklöf 2019-10-16 21:52:12 +02:00
parent 3ca6f9fe0b
commit a789230cf9
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
5 changed files with 21 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

10
font.c
View file

@ -291,8 +291,8 @@ from_name(const char *base_name, const font_list_t *fallbacks, const char *attri
return true;
}
bool
font_from_name(font_list_t names, const char *attributes, struct font *font)
struct font *
font_from_name(font_list_t names, const char *attributes)
{
if (tll_length(names) == 0)
return false;
@ -308,10 +308,14 @@ font_from_name(font_list_t names, const char *attributes, struct font *font)
tll_push_back(fallbacks, it->item);
}
struct font *font = malloc(sizeof(*font));
bool ret = from_name(tll_front(names), &fallbacks, attributes, font, false);
if (!ret)
free(font);
tll_free(fallbacks);
return ret;
return ret ? font : NULL;
}
static size_t