X-Git-Url: https://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Fppastats.c;h=754cf4e1aa76bab377e8f4f302770dcdd06370bd;hb=46db2198db02ed75562dd331d68ddbbbb1f1cff4;hp=a7cd7e9d20b160190223456c5db87fa70a20fa97;hpb=df7ffb359d84bd4eb3dbeafdc528eb0ac3675073;p=ppastats.git

diff --git a/src/ppastats.c b/src/ppastats.c
index a7cd7e9..754cf4e 100644
--- a/src/ppastats.c
+++ b/src/ppastats.c
@@ -161,8 +161,7 @@ static struct arch_stats *get_arch_stats(struct distro_stats *distro,
 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;
@@ -180,28 +179,23 @@ static struct daily_download_total **add_total
 		}
 	}
 
-	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);
-
+	result = (struct daily_download_total **)list_add((void **)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;
-	struct daily_download_total **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++;
 	}
 
@@ -215,6 +209,7 @@ pkg_add_distro(struct package_stats *pkg,
 	       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;
@@ -231,15 +226,32 @@ pkg_add_distro(struct package_stats *pkg,
 
 	if (!pkg_distro) {
 		pkg_distro = distro_stats_new(distro_name);
-		tmp
-			= (struct distro_stats **)
-			list_add((void **)pkg->distros, (void *)pkg_distro);
+		tmp = (struct distro_stats **)list_add((void **)pkg->distros,
+						       (void *)pkg_distro);
 		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 *
@@ -258,7 +270,7 @@ create_ppa_stats(const char *owner,
 	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);
@@ -269,12 +281,7 @@ create_ppa_stats(const char *owner,
 		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;
@@ -293,18 +300,24 @@ create_ppa_stats(const char *owner,
 			= 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;
@@ -341,6 +354,8 @@ static void distro_stats_free(struct distro_stats *distro)
 		free(distro->archs);
 	}
 
+	daily_download_total_list_free(distro->ddts);
+
 	free(distro->name);
 	free(distro);
 }
@@ -368,6 +383,8 @@ static void version_stats_free(struct version_stats *version)
 		free(version->distros);
 	}
 
+	daily_download_total_list_free(version->daily_download_totals);
+
 	free(version->version);
 	free(version);
 }
@@ -385,6 +402,7 @@ static void package_stats_free(struct package_stats *package)
 		free(package->versions);
 	}
 	distro_stats_list_free(package->distros);
+	daily_download_total_list_free(package->daily_download_totals);
 	free(package->name);
 	free(package);
 }