X-Git-Url: http://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Flist.c;h=0d5b02e6d18d46d41b2d8b875c519f0f593bae19;hb=47415d6ef7b12572e99b59d18dc63e053fdb4f16;hp=4157deed90f046cc3680e4a448d04360fba8e787;hpb=4f673b9c3df300c81d8bf73635688dbc249c7a53;p=ppastats.git diff --git a/src/list.c b/src/list.c index 4157dee..0d5b02e 100644 --- a/src/list.c +++ b/src/list.c @@ -1,26 +1,26 @@ /* - * 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 #include -#include "list.h" +#include int list_length(void **list) { @@ -47,10 +47,8 @@ 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; @@ -75,8 +73,6 @@ void **list_append_list(void **list1, void **list2) list[n1+n2] = NULL; - free(list1); - return list; }