administrativa

[m6w6/ext-psi] / src / plist.c

diff --git a/src/plist.c b/src/plist.c
index 38cde5b435c3d1b7e6d16ff844ca4b180c735482..048305ac8514e7cc2995cdf52a4b28f84cb12d26 100644 (file)
--- a/src/plist.c
+++ b/src/plist.c
@@ -42,6 +42,7 @@ struct psi_plist {
                memcpy(dest, src, list->size); \
        } \
 } while (0)
+#define PLIST_CPY_R(list, dest, src, num) memcpy((dest), (src), (num) * (list)->size)
 /* !!! adjust list->count prior reduction */
 #define PLIST_MOV_REDUCE(l, i) PLIST_MOV_REDUCE_EX(l, i, 1)
 #define PLIST_MOV_REDUCE_EX(l, i, n) memmove(PLIST_ELE(l, i), PLIST_ELE(l, (i) + (n)), (l)->size * ((l)->count - (i)))
@@ -59,7 +60,7 @@ struct psi_plist *psi_plist_init_ex(size_t size, void (*dtor)(void *)) {
                size = sizeof(void*);
        }
 
-       list = calloc(1, sizeof(*list) + size);
+       list = pecalloc(1, sizeof(*list) + size, 1);
        list->size = size;
        list->dtor = dtor;
 
@@ -87,7 +88,7 @@ void psi_plist_free(struct psi_plist *list) {
 struct psi_plist *psi_plist_copy(struct psi_plist *list, void (*ctor)(void *))
 {
        size_t i;
-       struct psi_plist *copy = calloc(1, sizeof(*list) + list->size + list->count * list->size);
+       struct psi_plist *copy = pecalloc(1, sizeof(*list) + list->size + list->count * list->size, 1);
 
        *copy = *list;
        if (list->count) {
@@ -112,7 +113,7 @@ void **psi_plist_eles(struct psi_plist *list) {
 
 struct psi_plist *psi_plist_add(struct psi_plist *list, void *ptr) {
        if (list && list->count) {
-               list = realloc(list, sizeof(*list) + list->size + list->count * list->size);
+               list = safe_perealloc(list, list->count + 1, list->size, sizeof(*list), 1);
        }
        if (list) {
                PLIST_CPY(list, PLIST_ELE(list, list->count++), ptr);
@@ -122,7 +123,7 @@ struct psi_plist *psi_plist_add(struct psi_plist *list, void *ptr) {
 
 struct psi_plist *psi_plist_add_r(struct psi_plist *list, size_t num_eles, void **eles) {
        if (list) {
-               list = realloc(list, sizeof(*list) + list->size + (num_eles + list->count) * list->size);
+               list = safe_perealloc(list, list->count + num_eles + 1, list->size, sizeof(*list), 1);
        }
        if (list) {
                memcpy(PLIST_ELE(list, list->count), eles, num_eles * list->size);
@@ -139,6 +140,14 @@ bool psi_plist_get(struct psi_plist *list, size_t index, void *ptr) {
        return false;
 }
 
+bool psi_plist_unset(struct psi_plist *list, size_t index) {
+       if (list && list->count > index) {
+               memset(PLIST_ELE(list, index), 0, list->size);
+               return true;
+       }
+       return false;
+}
+
 bool psi_plist_del(struct psi_plist *list, size_t index, void *ptr) {
        if (list && list->count > index) {
                if (ptr) {
@@ -181,7 +190,7 @@ struct psi_plist *psi_plist_ins(struct psi_plist *list, size_t index, void *ptr)
        if (list) {
                new_count = MAX(list->count + 1, index);
                if (new_count) {
-                       list = realloc(list, sizeof(*list) + list->size + new_count * list->size);
+                       list = safe_perealloc(list, new_count + 1, list->size, sizeof(*list), 1);
                }
                if (list) {
                        PLIST_MOV_EXPAND(list, index);
@@ -198,15 +207,11 @@ struct psi_plist *psi_plist_ins_r(struct psi_plist *list, size_t offset_start, s
        if (list) {
                new_count = MAX(offset_start, list->count) + num_eles;
                if (new_count) {
-                       list = realloc(list, sizeof(*list) + list->size + new_count * list->size);
+                       list = safe_perealloc(list, new_count + 1, list->size, sizeof(*list), 1);
                }
                if (list) {
-                       size_t e;
-
                        PLIST_MOV_EXPAND_EX(list, offset_start, num_eles);
-                       for (e = 0; e < num_eles; ++e) {
-                               PLIST_CPY(list, PLIST_ELE(list, offset_start + e), &eles[e]);
-                       }
+                       PLIST_CPY_R(list, PLIST_ELE(list, offset_start), eles, num_eles);
                        list->count = new_count;
                }
        }