code cleanup

diff --git a/src/ppastats.c b/src/ppastats.c
index 1fa0e81..9dd5c46 100644 (file)
--- a/src/ppastats.c
+++ b/src/ppastats.c
@@ -183,15 +183,13 @@ struct daily_download_total **add_totals
 
 struct ppa_stats *
 create_ppa_stats(const char *owner,
-                const char *ppa,
+                const char *ppa_name,
                 const char *package_status)
 {
-       struct ppa_stats *ppastats;
-       struct binary_package_publishing_history **history;
-       struct binary_package_publishing_history **h_cur;
-       struct binary_package_publishing_history *h;
-       char *ppa_url, *package_name, *package_version;
-       struct package_stats *package;
+       struct ppa_stats *ppa;
+       struct binary_package_publishing_history **history, **h_cur, *h;
+       char *ppa_url, *pkg_name, *pkg_version;
+       struct package_stats *pkg;
        struct version_stats *version;
        const struct distro_series *distro_series;
        const struct distro_arch_series *arch_series;
@@ -200,7 +198,7 @@ create_ppa_stats(const char *owner,
        int count;
        struct daily_download_total **totals;
 
-       ppa_url = get_archive_url(owner, ppa);
+       ppa_url = get_archive_url(owner, ppa_name);
        history = get_binary_package_publishing_history_list(ppa_url,
                                                             package_status);
        free(ppa_url);
@@ -210,30 +208,38 @@ create_ppa_stats(const char *owner,
                exit(EXIT_FAILURE);
        }
 
-       ppastats = malloc(sizeof(struct ppa_stats));
-       ppastats->name = strdup(ppa);
-       ppastats->owner = strdup(owner);
-       ppastats->packages = NULL;
-       ppastats->daily_download_totals = NULL;
-       ppastats->download_count = 0;
+       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;
 
        h_cur = history;
        while (*h_cur) {
                h = *h_cur;
-               package_name = h->binary_package_name;
-               package_version = h->binary_package_version;
+               totals = get_daily_download_totals(h->self_link);
+               count = get_download_count(h->self_link);
+               pkg_name = h->binary_package_name;
+               pkg_version = h->binary_package_version;
                arch_series
                        = get_distro_arch_series(h->distro_arch_series_link);
                distro_series
                        = get_distro_series(arch_series->distroseries_link);
 
-               count = get_download_count(h->self_link);
+               ppa->download_count += count;
+               ppa->daily_download_totals
+                       = add_totals(ppa->daily_download_totals, totals);
 
-               package = get_package_stats(ppastats, package_name);
-               package->download_count += count;
+               pkg = get_package_stats(ppa, pkg_name);
+               pkg->download_count += count;
+               pkg->daily_download_totals
+                       = add_totals(pkg->daily_download_totals, totals);
 
-               version = get_version_stats(package, package_version);
+               version = get_version_stats(pkg, pkg_version);
                version->download_count += count;
+               version->daily_download_totals
+                       = add_totals(version->daily_download_totals, totals);
 
                distro = get_distro_stats(version, distro_series->name);
                distro->download_count += count;
@@ -241,22 +247,6 @@ create_ppa_stats(const char *owner,
                arch = get_arch_stats(distro, arch_series->architecture_tag);
                arch->download_count += count;
 
-               ppastats->download_count += count;
-
-               totals = get_daily_download_totals(h->self_link);
-
-               ppastats->daily_download_totals
-                       = add_totals(ppastats->daily_download_totals,
-                                    totals);
-
-               package->daily_download_totals
-                       = add_totals(package->daily_download_totals,
-                                    totals);
-
-               version->daily_download_totals
-                       = add_totals(version->daily_download_totals,
-                                    totals);
-
                daily_download_total_list_free(totals);
 
                h_cur++;
@@ -264,7 +254,7 @@ create_ppa_stats(const char *owner,
 
        binary_package_publishing_history_list_free(history);
 
-       return ppastats;
+       return ppa;
 }
 
 static void arch_stats_free(struct arch_stats *arch)