caskd/bemenu
1
0
Fork 0
forked from RepoMirrors/bemenu
Code Pull Requests Activity

Use sizeof(void*) and fix list remove.

Browse Source
This commit is contained in:
Jari Vetoniemi 2014-10-25 21:53:48 +03:00
parent d799bbd246
commit c1bdca9cc4
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/list.c
View File

@ -77,14 +77,14 @@ list_grow(struct list *list, uint32_t step)
assert(list); assert(list);
void *tmp; void *tmp;
uint32_t nsize = sizeof(struct bm_item*) * (list->allocated + step); uint32_t nsize = sizeof(void*) * (list->allocated + step);
if (!(tmp = realloc(list->items, nsize))) if (!(tmp = realloc(list->items, nsize)))
return false; return false;
list->items = tmp; list->items = tmp;
list->allocated += step; list->allocated += step;
memset(&list->items[list->count], 0, sizeof(struct bm_item*) * (list->allocated - list->count)); memset(&list->items[list->count], 0, sizeof(void*) * (list->allocated - list->count));
return true; return true;
} }
@ -98,7 +98,7 @@ list_add_item_at(struct list *list, void *item, uint32_t index)
if (index + 1 != list->count) { if (index + 1 != list->count) {
uint32_t i = index; uint32_t i = index;
memmove(&list->items[i + 1], &list->items[i], sizeof(struct bm_item*) * (list->count - i)); memmove(&list->items[i + 1], &list->items[i], sizeof(void*) * (list->count - i));
} }
list->items[index] = item; list->items[index] = item;
@ -122,7 +122,8 @@ list_remove_item_at(struct list *list, uint32_t index)
if (!list->items || list->count <= i) if (!list->items || list->count <= i)
return false; return false;
memmove(&list->items[i], &list->items[i], sizeof(void*) * (list->count - i)); memmove(&list->items[i], &list->items[i + 1], sizeof(void*) * (list->count - i));
list->count--;
return true; return true;
} }