cleanup

diff --git a/configure b/configure
index 5c4f2a5..4acb372 100755 (executable)
--- a/configure
+++ b/configure
@@ -7131,7 +7131,6 @@ fi
 done
 
 
-
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
 # tests run on this system so they can be shared between configure

diff --git a/po/fr.po b/po/fr.po
index ff91990..627780c 100644 (file)
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ppastats 0.0.x\n"
 "Report-Msgid-Bugs-To: jeanfi@gmail.com\n"
-"POT-Creation-Date: 2014-02-23 16:44+0100\n"
+"POT-Creation-Date: 2014-02-25 13:33+0100\n"
 "PO-Revision-Date: 2012-05-05 23:45+0200\n"
 "Last-Translator:  <jeanfi@gmail.com>\n"
 "Language-Team: French\n"
@@ -145,11 +145,11 @@ msgstr ""
 msgid "Try `%s --help' for more information.\n"
 msgstr ""
 
-#: src/ppastats.c:306
+#: src/ppastats.c:353
 msgid "Failed to retrieve PPA information"
 msgstr ""
 
-#: src/ppastats.c:316
+#: src/ppastats.c:363
 #, c-format
 msgid "Failed to retrieve download totals for %s"
 msgstr ""

diff --git a/po/ppastats.pot b/po/ppastats.pot
index c6c1146..2210450 100644 (file)
--- a/po/ppastats.pot
+++ b/po/ppastats.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ppastats 1.0.x\n"
 "Report-Msgid-Bugs-To: jeanfi@gmail.com\n"
-"POT-Creation-Date: 2014-02-23 16:44+0100\n"
+"POT-Creation-Date: 2014-02-25 13:33+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -135,11 +135,11 @@ msgstr ""
 msgid "Try `%s --help' for more information.\n"
 msgstr ""
 
-#: src/ppastats.c:306
+#: src/ppastats.c:353
 msgid "Failed to retrieve PPA information"
 msgstr ""
 
-#: src/ppastats.c:316
+#: src/ppastats.c:363
 #, c-format
 msgid "Failed to retrieve download totals for %s"
 msgstr ""

diff --git a/src/ppastats.c b/src/ppastats.c
index aa07ba9..c1c18d8 100644 (file)
--- a/src/ppastats.c
+++ b/src/ppastats.c
@@ -29,6 +29,99 @@
 #include <plog.h>
 #include <ppastats.h>
 
+static void arch_stats_free(struct arch_stats *arch)
+{
+       free(arch->name);
+       free(arch);
+}
+
+static struct distro_stats *distro_stats_new(const char *name)
+{
+       struct distro_stats *d;
+
+       d = malloc(sizeof(struct distro_stats));
+       d->name = strdup(name);
+       d->archs = NULL;
+       d->download_count = 0;
+       d->ddts = NULL;
+
+       return d;
+}
+
+static void distro_stats_free(struct distro_stats *distro)
+{
+       struct arch_stats **archs;
+
+       archs = distro->archs;
+       if (archs) {
+               while (*archs) {
+                       arch_stats_free(*archs);
+                       archs++;
+               }
+               free(distro->archs);
+       }
+
+       daily_download_total_list_free(distro->ddts);
+
+       free(distro->name);
+       free(distro);
+}
+
+static void distro_stats_list_free(struct distro_stats **distros)
+{
+       struct distro_stats **cur;
+
+       if (distros) {
+               cur = distros;
+               while (*cur) {
+                       distro_stats_free(*cur);
+                       cur++;
+               }
+               free(distros);
+       }
+}
+
+static void version_stats_free(struct version_stats *version)
+{
+       distro_stats_list_free(version->distros);
+       daily_download_total_list_free(version->daily_download_totals);
+
+       free(version->version);
+       free(version);
+}
+
+static void package_stats_free(struct package_stats *package)
+{
+       struct version_stats **versions;
+
+       versions = package->versions;
+       if (versions) {
+               while (*versions) {
+                       version_stats_free(*versions);
+                       versions++;
+               }
+               free(package->versions);
+       }
+       distro_stats_list_free(package->distros);
+       daily_download_total_list_free(package->daily_download_totals);
+       free(package->name);
+       free(package);
+}
+
+static struct package_stats *package_stats_new(const char *name)
+{
+       struct package_stats *p;
+
+       p = malloc(sizeof(struct package_stats));
+       p->name = strdup(name);
+       p->versions = NULL;
+       p->download_count = 0;
+       p->daily_download_totals = NULL;
+       p->distros = NULL;
+
+       return p;
+}
+
 static struct package_stats *get_package_stats(struct ppa_stats *stats,
                                               const char *name)
 
@@ -45,15 +138,9 @@ static struct package_stats *get_package_stats(struct ppa_stats *stats,
                p_cur++;
        }
 
-       p = malloc(sizeof(struct package_stats));
-       p->name = strdup(name);
-       p->versions = NULL;
-       p->download_count = 0;
-       p->daily_download_totals = NULL;
-       p->distros = NULL;
+       p = package_stats_new(name);
 
-       tmp = (struct package_stats **)list_add
-               ((void **)stats->packages, p);
+       tmp = (struct package_stats **)list_add((void **)stats->packages, p);
        free(stats->packages);
        stats->packages = tmp;
 
@@ -89,44 +176,6 @@ static struct version_stats *get_version_stats(struct package_stats *package,
        return v;
 }
 
-static void arch_stats_free(struct arch_stats *arch)
-{
-       free(arch->name);
-       free(arch);
-}
-
-static struct distro_stats *distro_stats_new(const char *name)
-{
-       struct distro_stats *d;
-
-       d = malloc(sizeof(struct distro_stats));
-       d->name = strdup(name);
-       d->archs = NULL;
-       d->download_count = 0;
-       d->ddts = NULL;
-
-       return d;
-}
-
-static void distro_stats_free(struct distro_stats *distro)
-{
-       struct arch_stats **archs;
-
-       archs = distro->archs;
-       if (archs) {
-               while (*archs) {
-                       arch_stats_free(*archs);
-                       archs++;
-               }
-               free(distro->archs);
-       }
-
-       daily_download_total_list_free(distro->ddts);
-
-       free(distro->name);
-       free(distro);
-}
-
 static struct distro_stats *get_distro_stats(struct version_stats *version,
                                             const char *name)
 {
@@ -359,47 +408,6 @@ create_ppa_stats(const char *owner,
        return ppa;
 }
 
-static void distro_stats_list_free(struct distro_stats **distros)
-{
-       struct distro_stats **cur;
-
-       if (distros) {
-               cur = distros;
-               while (*cur) {
-                       distro_stats_free(*cur);
-                       cur++;
-               }
-               free(distros);
-       }
-}
-
-static void version_stats_free(struct version_stats *version)
-{
-       distro_stats_list_free(version->distros);
-       daily_download_total_list_free(version->daily_download_totals);
-
-       free(version->version);
-       free(version);
-}
-
-static void package_stats_free(struct package_stats *package)
-{
-       struct version_stats **versions;
-
-       versions = package->versions;
-       if (versions) {
-               while (*versions) {
-                       version_stats_free(*versions);
-                       versions++;
-               }
-               free(package->versions);
-       }
-       distro_stats_list_free(package->distros);
-       daily_download_total_list_free(package->daily_download_totals);
-       free(package->name);
-       free(package);
-}
-
 void ppa_stats_free(struct ppa_stats *ppastats)
 {
        struct package_stats **packages;