X-Git-Url: http://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Flist.c;h=e67078a6f4cfc79ad477495fe386112e12be12ff;hb=8fbc54a7960312d1626f4032d5fef5bf8a37db70;hp=ceb4efab2a3020c5d48b5c809b8a0208cc5193cf;hpb=05efb0b6dfba33b3dc441b4bbb795d056d404399;p=ppastats.git

diff --git a/src/list.c b/src/list.c
index ceb4efa..e67078a 100644
--- a/src/list.c
+++ b/src/list.c
@@ -1,21 +1,21 @@
 /*
-    Copyright (C) 2011 jeanfi@gmail.com
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-    02110-1301 USA
-*/
+ * Copyright (C) 2011-2014 jeanfi@gmail.com
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ */
 
 #include <stdlib.h>
 #include <string.h>
@@ -26,8 +26,11 @@ int list_length(void **list)
 {
 	int n;
 
+	if (!list)
+		return 0;
+
 	n = 0;
-	while (list && *list) {
+	while (*list) {
 		list++;
 		n++;
 	}
@@ -44,14 +47,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_append_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;
+}
+