fyb/calcurse-edge
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do not use malloc() or xmalloc()

Browse Source 
Use mem_malloc() instead which automatically picks the right
implementation depending on whether memory debugging is enabled or not.

Signed-off-by: Lukas Fleischer <calcurse@cryptocrack.de>
This commit is contained in:
Lukas Fleischer 2014-07-18 08:47:23 +02:00
parent 58f6ac62aa
commit e9d4d3c505
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/calcurse.c
View File

@ -276,10 +276,10 @@ static inline void key_generic_reload(void)
case 1:
break;
case 2:
path_apts_backup = xmalloc(strlen(path_apts) +
strlen(backup_ext) + 1);
path_todo_backup = xmalloc(strlen(path_todo) +
strlen(backup_ext) + 1);
path_apts_backup = mem_malloc(strlen(path_apts) +
strlen(backup_ext) + 1);
path_todo_backup = mem_malloc(strlen(path_todo) +
strlen(backup_ext) + 1);
sprintf(path_apts_backup, "%s%s", path_apts,
backup_ext);
sprintf(path_todo_backup, "%s%s", path_todo,

4
src/listbox.c
View File

@ -97,8 +97,8 @@ void listbox_load_items(struct listbox *lb, int item_count)
free(lb->type);
free(lb->ch);
lb->type = xmalloc(item_count * sizeof(unsigned));
lb->ch = xmalloc((item_count + 1) * sizeof(unsigned));
lb->type = mem_malloc(item_count * sizeof(unsigned));
lb->ch = mem_malloc((item_count + 1) * sizeof(unsigned));
for (i = 0, ch = 0; i < item_count; i++) {
lb->type[i] = lb->fn_type(i, lb->cb_data);
lb->ch[i] = ch;

2
src/vector.c
View File

@ -43,7 +43,7 @@ void vector_init(vector_t *v, unsigned size)
{
v->count = 0;
v->size = size;
v->data = malloc(size * sizeof(void *));
v->data = mem_malloc(size * sizeof(void *));
}
/*