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

diff --git a/src/plist.c b/src/plist.c
index 1a69fc1..58f7898 100644
--- 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)))
@@ -121,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) {
@@ -204,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;
 		}
 	}