X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Fplist.c;h=58f7898a7162c17335e631ce09b45271b96fff9a;hp=2cf4eb3674e509378eba5312ff7d7cf2b46851d7;hb=2fa436074ca9a5e87f39b696de832fa2188fcfc6;hpb=42f44eb5bf4ecd36e26e051fada79d861d0f92d2

diff --git a/src/plist.c b/src/plist.c
index 2cf4eb3..58f7898 100644
--- a/src/plist.c
+++ b/src/plist.c
@@ -42,12 +42,13 @@ 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))
+#define PLIST_MOV_REDUCE_EX(l, i, n) memmove(PLIST_ELE(l, i), PLIST_ELE(l, (i) + (n)), (l)->size * ((l)->count - (i)))
 /* !!! adjust list->count after expansion */
 #define PLIST_MOV_EXPAND(l, i) PLIST_MOV_EXPAND_EX(l, i, 1)
-#define PLIST_MOV_EXPAND_EX(l, i, n) memmove(PLIST_ELE(l, i + n), PLIST_ELE(l, i), (l)->size * ((l)->count - i))
+#define PLIST_MOV_EXPAND_EX(l, i, n) memmove(PLIST_ELE(l, (i) + (n)), PLIST_ELE(l, i), (l)->size * ((l)->count - (i)))
 
 struct psi_plist *psi_plist_init(void (*dtor)(void *)) {
 	return psi_plist_init_ex(0, dtor);
@@ -69,15 +70,19 @@ struct psi_plist *psi_plist_init_ex(size_t size, void (*dtor)(void *)) {
 void psi_plist_clean(struct psi_plist *list) {
 	size_t i;
 
-	if (list->dtor) for (i = 0; i < list->count; ++i) {
-		list->dtor(PLIST_ELE(list, i));
+	if (list) {
+		if (list->dtor) for (i = 0; i < list->count; ++i) {
+			list->dtor(PLIST_ELE(list, i));
+		}
+		list->count = 0;
 	}
-	list->count = 0;
 }
 
 void psi_plist_free(struct psi_plist *list) {
-	psi_plist_clean(list);
-	free(list);
+	if (list) {
+		psi_plist_clean(list);
+		free(list);
+	}
 }
 
 struct psi_plist *psi_plist_copy(struct psi_plist *list, void (*ctor)(void *))
@@ -117,7 +122,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->count) {
+	if (list) {
 		list = realloc(list, sizeof(*list) + list->size + (num_eles + list->count) * list->size);
 	}
 	if (list) {
@@ -192,7 +197,7 @@ struct psi_plist *psi_plist_ins_r(struct psi_plist *list, size_t offset_start, s
 	size_t new_count;
 
 	if (list) {
-		new_count = MAX(offset_start + 1, list->count) + num_eles;
+		new_count = MAX(offset_start, list->count) + num_eles;
 		if (new_count) {
 			list = realloc(list, sizeof(*list) + list->size + new_count * list->size);
 		}
@@ -200,9 +205,7 @@ struct psi_plist *psi_plist_ins_r(struct psi_plist *list, size_t offset_start, s
 			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;
 		}
 	}