StarMirror/toxcore
1
0
Fork 0
mirror of https://github.com/irungentoo/toxcore.git synced 2024-03-22 13:30:51 +08:00
Code Issues Projects Releases Wiki Activity

Fixed possible issues with list introduced in the last commit.

Browse Source
This commit is contained in:
irungentoo 2014-06-21 22:22:30 -04:00
parent f3c09d1854
commit e6699f60ef
No known key found for this signature in database
GPG Key ID: 10349DC9BED89E98
1 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
toxcore/list.c
View File

@ -140,14 +140,16 @@ int bs_list_init(BS_LIST *list, uint32_t element_size, uint32_t initial_capacity
//set initial values //set initial values
list->n = 0; list->n = 0;
list->element_size = element_size; list->element_size = element_size;
if (initial_capacity == 0) { list->capacity = 0;
list->data = NULL; list->data = NULL;
list->ids = NULL; list->ids = NULL;
} else {
if (initial_capacity != 0) {
if (!resize(list, initial_capacity)) { if (!resize(list, initial_capacity)) {
return 0; return 0;
} }
} }
list->capacity = initial_capacity; list->capacity = initial_capacity;
return 1; return 1;
@ -188,15 +190,18 @@ int bs_list_add(BS_LIST *list, const void *data, int id)
//increase the size of the arrays if needed //increase the size of the arrays if needed
if (list->n == list->capacity) { if (list->n == list->capacity) {
// 1.5 * n + 1 // 1.5 * n + 1
const uint32_t new_capacity = list->n + list->n/2 + 1; const uint32_t new_capacity = list->n + list->n / 2 + 1;
if (!resize(list, new_capacity)) { if (!resize(list, new_capacity)) {
return 0; return 0;
} }
list->capacity = new_capacity; list->capacity = new_capacity;
} }
//insert data to element array //insert data to element array
memmove(list->data + (i + 1) * list->element_size, list->data + i * list->element_size, (list->n - i) * list->element_size); memmove(list->data + (i + 1) * list->element_size, list->data + i * list->element_size,
(list->n - i) * list->element_size);
memcpy(list->data + i * list->element_size, data, list->element_size); memcpy(list->data + i * list->element_size, data, list->element_size);
//insert id to id array //insert id to id array
@ -223,17 +228,18 @@ int bs_list_remove(BS_LIST *list, const void *data, int id)
} }
//decrease the size of the arrays if needed //decrease the size of the arrays if needed
if (list->n < list->capacity/2) { if (list->n < list->capacity / 2) {
const uint32_t new_capacity = list->capacity/2; const uint32_t new_capacity = list->capacity / 2;
if (!resize(list, new_capacity)) {
return 0; if (resize(list, new_capacity)) {
list->capacity = new_capacity;
} }
list->capacity = new_capacity;
} }
list->n--; list->n--;
memmove(list->data + i * list->element_size, list->data + (i + 1) * list->element_size, (list->n - i) * list->element_size); memmove(list->data + i * list->element_size, list->data + (i + 1) * list->element_size,
(list->n - i) * list->element_size);
memmove(&list->ids[i], &list->ids[i + 1], (list->n - i) * sizeof(int)); memmove(&list->ids[i], &list->ids[i + 1], (list->n - i) * sizeof(int));
return 1; return 1;