/*
- * 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
- */
+ 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>
-#include "list.h"
+#include <list.h>
int list_length(void **list)
{
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;
struct bpph **bpph_list_add(struct bpph **list, struct bpph *new)
{
- struct bpph **cur, *bpph;
+ struct bpph **cur, *bpph, **result;
if (list)
for (cur = list; *cur; cur++) {
return list;
}
- return (struct bpph **)list_add((void **)list, new);
+ result = (struct bpph **)list_add((void **)list, new);
+
+ free(list);
+
+ return result;
}
struct bpph **bpph_list_append_list(struct bpph **list1, struct bpph **list2)
const char *name)
{
- struct package_stats *p, **p_cur;
+ struct package_stats *p, **p_cur, **tmp;
p_cur = stats->packages;
while (p_cur && *p_cur) {
p->daily_download_totals = NULL;
p->distros = NULL;
- stats->packages = (struct package_stats **)list_add
+ tmp = (struct package_stats **)list_add
((void **)stats->packages, p);
+ free(stats->packages);
+ stats->packages = tmp;
return p;
}
static struct version_stats *get_version_stats(struct package_stats *package,
const char *version)
{
- struct version_stats *v, **cur;
+ struct version_stats *v, **cur, **tmp;
cur = package->versions;
while (cur && *cur) {
v->download_count = 0;
v->daily_download_totals = NULL;
- package->versions
- = (struct version_stats **)list_add((void **)package->versions,
- v);
+ tmp = (struct version_stats **)list_add((void **)package->versions,
+ v);
+ free((void **)package->versions);
+ package->versions = tmp;
return v;
}
{
struct distro_stats **cur = version->distros;
struct distro_stats *d;
+ struct distro_stats **tmp;
while (cur && *cur) {
d = *cur;
d = distro_stats_new(name);
- version->distros
- = (struct distro_stats **)list_add((void **)version->distros,
+
+ tmp = (struct distro_stats **)list_add((void **)version->distros,
d);
+ free(version->distros);
+ version->distros = tmp;
return d;
}
{
struct arch_stats **cur = distro->archs;
struct arch_stats *a;
+ struct arch_stats **tmp;
while (cur && *cur) {
a = *cur;
a->name = strdup(name);
a->download_count = 0;
- distro->archs
- = (struct arch_stats **)list_add((void **)distro->archs,
- a);
+ tmp = (struct arch_stats **)list_add((void **)distro->archs,
+ a);
+ free((void **)distro->archs);
+ distro->archs = tmp;
return a;
}
static struct daily_download_total **add_total
(struct daily_download_total **totals, struct daily_download_total *total)
{
- struct daily_download_total **cur;
+ struct daily_download_total **cur, **result;
struct daily_download_total *item;
if (totals) {
item = malloc(sizeof(struct daily_download_total));
memcpy(item, total, sizeof(struct daily_download_total));
- return (struct daily_download_total **)
+ result = (struct daily_download_total **)
list_add((void **)totals, (void *)item);
+
+ free(totals);
+
+ return result;
}
struct daily_download_total **add_totals
int distro_count,
struct daily_download_total **ddts)
{
- struct distro_stats **pkg_distros, *pkg_distro;
+ struct distro_stats **pkg_distros, *pkg_distro, **tmp;
pkg_distros = pkg->distros;
pkg_distro = NULL;
if (!pkg_distro) {
pkg_distro = distro_stats_new(distro_name);
- pkg->distros
+ tmp
= (struct distro_stats **)
list_add((void **)pkg->distros, (void *)pkg_distro);
+ free(pkg->distros);
+ pkg->distros = tmp;
}
pkg_distro->download_count += distro_count;