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

list takes data to remove faster

Browse Source
This commit is contained in:
notsecure 2014-05-20 07:04:41 -04:00
parent d65ea9bc8d
commit 35ae6cb90e
2 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
toxcore/list.c
View File

@ -176,23 +176,21 @@ int list_add(LIST *list, void *data, int id)
return 1;
}
void list_remove(LIST *list, int id)
int list_remove(LIST *list, void *data, int id)
{
int i;
int i = find(list, data);
for (i = 0; i < list->n; i++) {
if (list->ids[i] == id) {
//decrease number of elements
list->n--;
//move elements in both arrays down by one
memmove(list->data + i * list->size, list->data + (i + 1) * list->size, (list->n - i) * list->size);
memmove(&list->ids[i], &list->ids[i + 1], (list->n - i) * sizeof(int));
//return causes it to only remove the first element with the specified id
//(as opposed to all elements with that id if there are more than one - but there normally should not be)
//i--;
return;
}
if (i < 0) {
return 0;
}
if (list->ids[i] != id) {
//this should never happen
return 0;
}
memmove(list->data + i * list->size, list->data + (i + 1) * list->size, (list->n - i) * list->size);
memmove(&list->ids[i], &list->ids[i + 1], (list->n - i) * sizeof(int));
return 1;
}

9
toxcore/list.h
View File

@ -56,5 +56,10 @@ int list_find(LIST *list, void *data);
*/
int list_add(LIST *list, void *data, int id);
/* Remove an element from the list */
void list_remove(LIST *list, int id);
/* Remove element from the list
*
* return value:
* 1 : success
* 0 : failure (element not found or id does not match
*/
int list_remove(LIST *list, void *data, int id);