X-Git-Url: http://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Flist.c;h=e67078a6f4cfc79ad477495fe386112e12be12ff;hb=1378a843b2e5ce3fbc4429b07844cc37d42e0d8e;hp=76a37e69db962875f21e44d8a6a06f5856023a98;hpb=cacd81cd1065cf9a145bb2fbe66c383ad3c90206;p=ppastats.git

diff --git a/src/list.c b/src/list.c
index 76a37e6..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++;
 	}
@@ -55,7 +58,7 @@ void **list_add(void **list, void *new_item)
 	return new_list;
 }
 
-void **list_add_list(void **list1, void **list2)
+void **list_append_list(void **list1, void **list2)
 {
 	int n1, n2, n;
 	void **list;