X-Git-Url: http://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Flist.c;h=76a37e69db962875f21e44d8a6a06f5856023a98;hb=cacd81cd1065cf9a145bb2fbe66c383ad3c90206;hp=ceb4efab2a3020c5d48b5c809b8a0208cc5193cf;hpb=f5fbf6bcfcac7e2b6df90e00f618c642539d013d;p=ppastats.git diff --git a/src/list.c b/src/list.c index ceb4efa..76a37e6 100644 --- a/src/list.c +++ b/src/list.c @@ -44,14 +44,36 @@ void **list_add(void **list, void *new_item) new_list = malloc(sizeof(void *)*(n+2)); - if (n) + if (n) { memcpy(new_list, list, sizeof(void *)*n); + free(list); + } new_list[n] = new_item; new_list[n+1] = NULL; - free(list); - return new_list; } +void **list_add_list(void **list1, void **list2) +{ + int n1, n2, n; + void **list; + + n1 = list_length(list1); + n2 = list_length(list2); + + n = n1 + n2 + 1; + + list = malloc(sizeof(void *)*(n+1)); + + memcpy(list, list1, n1*sizeof(void *)); + memcpy(list+n1, list2, n2*sizeof(void *)); + + list[n1+n2] = NULL; + + free(list1); + + return list; +} +