gnu/wget2
1
0
Fork 0
mirror of https://gitlab.com/gnuwget/wget2.git synced 2026-02-01 14:41:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use xfree, xmalloc and xcalloc

Browse Source 
* libwget/bar.c: Replace all calls to free(), malloc() and calloc() with
xfree(), xmalloc() and xcalloc() respectively
* libwget/hashmap.c: Same
This commit is contained in:
Darshit Shah
2016-09-14 12:13:01 +02:00
committed by Tim Rühsen
parent e2b83d153c
commit 21e050a614
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
libwget/bar.c
View File

@ -128,29 +128,29 @@ wget_bar_t *wget_bar_init(wget_bar_t *bar, int nslots, int max_width)
max_width -= _BAR_DECOR_COST;
if (!bar) {
if (!(bar = calloc(1, sizeof(*bar))))
if (!(bar = xcalloc(1, sizeof(*bar))))
return NULL;
allocated = 1;
} else
memset(bar, 0, sizeof(*bar));
if (bar->nslots < nslots) {
free(bar->slots);
xfree(bar->slots);
bar->nslots = nslots;
if (!(bar->slots = calloc(nslots, sizeof(_bar_slot_t) * nslots)))
if (!(bar->slots = xcalloc(nslots, sizeof(_bar_slot_t) * nslots)))
goto cleanup;
} else {
memset(bar->slots, 0, sizeof(_bar_slot_t) * nslots);
}
if (bar->max_width < max_width) {
free(bar->filled);
if (!(bar->filled = malloc(max_width)))
xfree(bar->filled);
if (!(bar->filled = xmalloc(max_width)))
goto cleanup;
memset(bar->filled, '=', max_width);
free(bar->spaces);
if (!(bar->spaces = malloc(max_width)))
xfree(bar->spaces);
if (!(bar->spaces = xmalloc(max_width)))
goto cleanup;
memset(bar->spaces, ' ', max_width);
@ -275,9 +275,9 @@ void wget_bar_update(const wget_bar_t *bar, int slotpos) {
void wget_bar_deinit(wget_bar_t *bar)
{
if (bar) {
free(bar->spaces);
free(bar->filled);
free(bar->slots);
xfree(bar->spaces);
xfree(bar->filled);
xfree(bar->slots);
}
}
@ -287,7 +287,7 @@ void wget_bar_deinit(wget_bar_t *bar)
void wget_bar_free(wget_bar_t **bar)
{
if (bar) {
free(*bar);
xfree(*bar);
}
}

2
libwget/hashmap.c
View File

@ -146,7 +146,7 @@ static _GL_INLINE void G_GNUC_WGET_NONNULL((1,3)) hashmap_new_entry(wget_hashmap
ENTRY *entry;
int pos = hash % h->max;
entry = malloc(sizeof(ENTRY));
entry = xmalloc(sizeof(ENTRY));
entry->key = (void *)key;
entry->value = (void *)value;
entry->hash = hash;