no way to avoid the typedef for supporting old json releases

[ppastats.git] / src / list.c

diff --git a/src/list.c b/src/list.c
index ceb4efa..e67078a 100644 (file)
--- 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;
+}
+