mirrors/foot
1
0
Fork 0
mirror of https://codeberg.org/dnkl/foot.git synced 2026-04-02 07:15:31 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

url-mode: be consistent; use xmalloc() + xrealloc()

Browse source
This commit is contained in:
Daniel Eklöf 2021-02-07 15:10:48 +01:00
parent 9066ba87df
commit c84e379767
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
url-mode.c
View file

@ -39,7 +39,7 @@ activate_url(struct seat *seat, struct terminal *term, const struct url *url)
size_t chars = wcstombs(NULL, url->url, 0); size_t chars = wcstombs(NULL, url->url, 0);
if (chars != (size_t)-1) { if (chars != (size_t)-1) {
char *url_utf8 = malloc(chars + 1); char *url_utf8 = xmalloc(chars + 1);
wcstombs(url_utf8, url->url, chars + 1); wcstombs(url_utf8, url->url, chars + 1);
switch (url->action) { switch (url->action) {
@ -360,7 +360,7 @@ generate_key_combos(size_t count, wchar_t *combos[static count])
static const size_t alphabet_len = ALEN(alphabet) - 1; static const size_t alphabet_len = ALEN(alphabet) - 1;
size_t hints_count = 1; size_t hints_count = 1;
wchar_t **hints = malloc(hints_count * sizeof(hints[0])); wchar_t **hints = xmalloc(hints_count * sizeof(hints[0]));
hints[0] = xwcsdup(L""); hints[0] = xwcsdup(L"");
@ -368,11 +368,11 @@ generate_key_combos(size_t count, wchar_t *combos[static count])
while (hints_count - offset < count || hints_count == 1) { while (hints_count - offset < count || hints_count == 1) {
const wchar_t *prefix = hints[offset++]; const wchar_t *prefix = hints[offset++];
hints = realloc(hints, (hints_count + alphabet_len) * sizeof(hints[0])); hints = xrealloc(hints, (hints_count + alphabet_len) * sizeof(hints[0]));
for (size_t i = 0; i < alphabet_len; i++) { for (size_t i = 0; i < alphabet_len; i++) {
wchar_t wc = alphabet[i]; wchar_t wc = alphabet[i];
wchar_t *hint = malloc((wcslen(prefix) + 1 + 1) * sizeof(wchar_t)); wchar_t *hint = xmalloc((wcslen(prefix) + 1 + 1) * sizeof(wchar_t));
/* Will be reversed later */ /* Will be reversed later */
hint[0] = wc; hint[0] = wc;