apaki/unicstl
1
0
Fork 0
mirror of https://gitee.com/apaki/unicstl.git synced 2025-05-17 19:41:36 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

insert函数的bug修复完毕

Browse Source
This commit is contained in:
建峰 2025-04-29 16:48:06 +08:00
parent c8a48e6c63
commit 0c545dfca5
1 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/list.c
View File

@ -33,8 +33,12 @@ static bool list_insert(struct _list* self, int index, void* obj)
} }
uint32_t offset = index * self->_obj_size; uint32_t offset = index * self->_obj_size;
uint32_t offset1 = (index + 1) * self->_obj_size; uint32_t offset1 = (index + 1) * self->_obj_size;
uint32_t count = self->size(self) - index;
memmove((char*)self->obj + offset, (char*)self->obj + offset, self->size(self) * self->_obj_size); // move data to right
memmove((char*)self->obj + offset1, (char*)self->obj + offset, count * self->_obj_size);
// copy new data
memmove((char*)self->obj + offset, obj, self->_obj_size);
self->_size += 1; self->_size += 1;
return true; return true;
} }
@ -58,9 +62,9 @@ static bool list_delete(struct _list* self, int index, void* obj)
index += self->size(self); index += self->size(self);
} }
uint32_t count = self->size(self) - 1 - index;
uint32_t offset = index * self->_obj_size; uint32_t offset = index * self->_obj_size;
uint32_t offset1 = (index + 1) * self->_obj_size; uint32_t offset1 = (index + 1) * self->_obj_size;
uint32_t count = self->size(self) - 1 - index;
if (obj != NULL) if (obj != NULL)
{ {
memmove(obj, (char*)self->obj + offset, self->_obj_size); memmove(obj, (char*)self->obj + offset, self->_obj_size);
@ -72,7 +76,7 @@ static bool list_delete(struct _list* self, int index, void* obj)
static bool list_append(struct _list* self, void* obj) static bool list_append(struct _list* self, void* obj)
{ {
#if 1 #if 0
assert(self != NULL); assert(self != NULL);
assert(self->obj != NULL); assert(self->obj != NULL);
assert(obj != NULL); assert(obj != NULL);
@ -94,13 +98,14 @@ static bool list_append(struct _list* self, void* obj)
self->_size += 1; self->_size += 1;
return true; return true;
#else
return self->insert(self, (int)self->size(self), obj);
#endif #endif
return self->insert(self, self->size(self), obj);
} }
static bool list_pop(struct _list* self, void* obj) static bool list_pop(struct _list* self, void* obj)
{ {
#if 1 #if 0
assert(self != NULL); assert(self != NULL);
if (self->empty(self)) if (self->empty(self))
@ -119,7 +124,11 @@ static bool list_pop(struct _list* self, void* obj)
self->_size -= 1; self->_size -= 1;
return true; return true;
#else #else
return self->delete(self, self->size(self) - 1, obj); if (self->empty(self))
{
return false;
}
return self->delete(self, (int)self->size(self) - 1, obj);
#endif #endif
} }
@ -185,6 +194,12 @@ static uint32_t list_size(struct _list* self)
return self->_size; return self->_size;
} }
static uint32_t list_capacity(struct _list* self)
{
assert(self != NULL);
return self->_capacity;
}
static bool list_empty(struct _list* self) static bool list_empty(struct _list* self)
{ {
assert(self != NULL); assert(self != NULL);
@ -294,6 +309,7 @@ static bool list_init2(struct _list* list, uint32_t obj_size, uint32_t capacity)
list->clear = list_clear; list->clear = list_clear;
list->size = list_size; list->size = list_size;
list->empty = list_empty; list->empty = list_empty;
list->capacity = list_capacity;
// iter // iter
list->iter = list_iter; list->iter = list_iter;