/*
- * 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 <libintl.h>
#include <stdlib.h>
#include <string.h>
-#include "list.h"
-#include "lp_ws.h"
+#include <list.h>
+#include <lp_ws.h>
#include <plog.h>
-#include "ppastats.h"
+#include <ppastats.h>
static struct package_stats *get_package_stats(struct ppa_stats *stats,
const char *name)
static struct distro_stats *get_distro_stats(struct version_stats *version,
const char *name)
{
- struct distro_stats **cur = version->distros;
- struct distro_stats *d;
- struct distro_stats **tmp;
+ struct distro_stats **cur, *d, **tmp;
+
+ cur = version->distros;
while (cur && *cur) {
d = *cur;
static struct daily_download_total **add_total
(struct daily_download_total **totals, struct daily_download_total *total)
{
- struct daily_download_total **cur, **result;
- struct daily_download_total *item;
+ struct daily_download_total **cur, **result, *item;
if (totals) {
cur = totals;
}
}
- item = malloc(sizeof(struct daily_download_total));
- memcpy(item, total, sizeof(struct daily_download_total));
-
result = (struct daily_download_total **)list_add((void **)totals,
- (void *)item);
-
- free(totals);
-
+ ddt_clone(total));
return result;
}
-struct daily_download_total **add_totals
+static struct daily_download_total **add_totals
(struct daily_download_total **total1, struct daily_download_total **total2)
{
- struct daily_download_total **cur, **result;
+ struct daily_download_total **cur, **result, **tmp;
result = total1;
cur = total2;
while (*cur) {
- result = add_total(result, *cur);
+ tmp = add_total(result, *cur);
+ if (result != total1 && result != tmp)
+ free(result);
+ result = tmp;
cur++;
}
struct daily_download_total **ddts)
{
struct distro_stats **pkg_distros, *pkg_distro, **tmp;
+ struct daily_download_total **tmp_ddts;
pkg_distros = pkg->distros;
pkg_distro = NULL;
pkg_distro = distro_stats_new(distro_name);
tmp = (struct distro_stats **)list_add((void **)pkg->distros,
(void *)pkg_distro);
- free(pkg->distros);
+ if (pkg->distros != tmp)
+ free(pkg->distros);
pkg->distros = tmp;
}
pkg_distro->download_count += distro_count;
- pkg_distro->ddts = add_totals(pkg_distro->ddts, ddts);
+
+ tmp_ddts = add_totals(pkg_distro->ddts, ddts);
+ if (pkg_distro->ddts && pkg_distro->ddts != tmp_ddts)
+ free(pkg_distro->ddts);
+ pkg_distro->ddts = tmp_ddts;
+}
+
+static struct ppa_stats *ppa_stats_new(const char *owner, const char *ppa_name)
+{
+ struct ppa_stats *ppa;
+
+ ppa = malloc(sizeof(struct ppa_stats));
+ ppa->name = strdup(ppa_name);
+ ppa->owner = strdup(owner);
+ ppa->packages = NULL;
+ ppa->daily_download_totals = NULL;
+ ppa->download_count = 0;
+
+ return ppa;
}
struct ppa_stats *
struct distro_stats *distro;
struct arch_stats *arch;
int count;
- struct daily_download_total **totals;
+ struct daily_download_total **totals, **tmp;
ppa_url = get_archive_url(owner, ppa_name);
history = get_bpph_list(ppa_url, package_status, ws_size);
exit(EXIT_FAILURE);
}
- ppa = malloc(sizeof(struct ppa_stats));
- ppa->name = strdup(ppa_name);
- ppa->owner = strdup(owner);
- ppa->packages = NULL;
- ppa->daily_download_totals = NULL;
- ppa->download_count = 0;
+ ppa = ppa_stats_new(owner, ppa_name);
for (h_cur = history; *h_cur; ++h_cur) {
h = *h_cur;
= get_distro_series(arch_series->distroseries_link);
ppa->download_count += count;
- ppa->daily_download_totals
- = add_totals(ppa->daily_download_totals, totals);
+ tmp = add_totals(ppa->daily_download_totals, totals);
+ if (ppa->daily_download_totals != tmp)
+ free(ppa->daily_download_totals);
+ ppa->daily_download_totals = tmp;
pkg = get_package_stats(ppa, pkg_name);
pkg->download_count += count;
- pkg->daily_download_totals
- = add_totals(pkg->daily_download_totals, totals);
+ tmp = add_totals(pkg->daily_download_totals, totals);
+ if (pkg->daily_download_totals != tmp)
+ free(pkg->daily_download_totals);
+ pkg->daily_download_totals = tmp;
version = get_version_stats(pkg, pkg_version);
version->download_count += count;
- version->daily_download_totals
- = add_totals(version->daily_download_totals, totals);
+ tmp = add_totals(version->daily_download_totals, totals);
+ if (version->daily_download_totals != tmp)
+ free(version->daily_download_totals);
+ version->daily_download_totals = tmp;
distro = get_distro_stats(version, distro_series->name);
distro->download_count += count;
free(distro->archs);
}
+ daily_download_total_list_free(distro->ddts);
+
free(distro->name);
free(distro);
}
distro_stats_free(*distros);
distros++;
}
+ free(distros);
}
}
static void version_stats_free(struct version_stats *version)
{
- struct distro_stats **distros;
-
- distros = version->distros;
- if (distros) {
- while (*distros) {
- distro_stats_free(*distros);
- distros++;
- }
- free(version->distros);
- }
+ distro_stats_list_free(version->distros);
+ daily_download_total_list_free(version->daily_download_totals);
free(version->version);
free(version);
free(package->versions);
}
distro_stats_list_free(package->distros);
+ daily_download_total_list_free(package->daily_download_totals);
free(package->name);
free(package);
}