fixed style

[ppastats.git] / src / ppastats.c

diff --git a/src/ppastats.c b/src/ppastats.c
index 4d8b874..5fb0be1 100644 (file)
--- a/src/ppastats.c
+++ b/src/ppastats.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2012 jeanfi@gmail.com
+ * 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
@@ -25,15 +25,15 @@
 #include <string.h>
 
 #include "list.h"
-#include "log.h"
 #include "lp_ws.h"
+#include <plog.h>
 #include "ppastats.h"
 
 static struct package_stats *get_package_stats(struct ppa_stats *stats,
                                               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) {
@@ -52,8 +52,10 @@ static struct package_stats *get_package_stats(struct ppa_stats *stats,
        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;
 }
@@ -61,7 +63,7 @@ static struct package_stats *get_package_stats(struct ppa_stats *stats,
 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) {
@@ -79,9 +81,10 @@ static struct version_stats *get_version_stats(struct package_stats *package,
        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;
 }
@@ -104,6 +107,7 @@ static struct distro_stats *get_distro_stats(struct version_stats *version,
 {
        struct distro_stats **cur = version->distros;
        struct distro_stats *d;
+       struct distro_stats **tmp;
 
        while (cur && *cur) {
                d = *cur;
@@ -116,9 +120,11 @@ static struct distro_stats *get_distro_stats(struct version_stats *version,
 
        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;
 }
@@ -128,6 +134,7 @@ static struct arch_stats *get_arch_stats(struct distro_stats *distro,
 {
        struct arch_stats **cur = distro->archs;
        struct arch_stats *a;
+       struct arch_stats **tmp;
 
        while (cur && *cur) {
                a = *cur;
@@ -142,9 +149,10 @@ static struct arch_stats *get_arch_stats(struct distro_stats *distro,
        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;
 }
@@ -153,7 +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;
+       struct daily_download_total **cur, **result;
        struct daily_download_total *item;
 
        if (totals) {
@@ -175,21 +183,23 @@ static struct daily_download_total **add_total
        item = malloc(sizeof(struct daily_download_total));
        memcpy(item, total, sizeof(struct daily_download_total));
 
-       return (struct daily_download_total **)
-               list_add((void **)totals, (void *)item);
+       result = (struct daily_download_total **)list_add((void **)totals,
+                                                         (void *)item);
+
+       free(totals);
+
+       return result;
 }
 
 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;
 
        result = total1;
        cur = total2;
        while (*cur) {
                result = add_total(result, *cur);
-
                cur++;
        }
 
@@ -202,7 +212,7 @@ pkg_add_distro(struct package_stats *pkg,
               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;
@@ -219,9 +229,10 @@ pkg_add_distro(struct package_stats *pkg,
 
        if (!pkg_distro) {
                pkg_distro = distro_stats_new(distro_name);
-               pkg->distros
-                       = (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;
@@ -231,7 +242,8 @@ pkg_add_distro(struct package_stats *pkg,
 struct ppa_stats *
 create_ppa_stats(const char *owner,
                 const char *ppa_name,
-                const char *package_status)
+                const char *package_status,
+                int ws_size)
 {
        struct ppa_stats *ppa;
        struct bpph **history, **h_cur, *h;
@@ -246,7 +258,7 @@ create_ppa_stats(const char *owner,
        struct daily_download_total **totals;
 
        ppa_url = get_archive_url(owner, ppa_name);
-       history = get_bpph_list(ppa_url, package_status);
+       history = get_bpph_list(ppa_url, package_status, ws_size);
        free(ppa_url);
 
        if (!history) {
@@ -269,12 +281,7 @@ create_ppa_stats(const char *owner,
                                h->self_link);
                        continue;
                }
-               count = get_download_count(h->self_link);
-               if (count == -1) {
-                       log_err(_("Failed to retrieve download count for %s"),
-                               h->self_link);
-                       count = 0;
-               }
+               count = ddts_get_count(totals);
                pkg_name = h->binary_package_name;
                pkg_version = h->binary_package_version;
                arch_series
@@ -335,6 +342,16 @@ static void distro_stats_free(struct distro_stats *distro)
        free(distro);
 }
 
+static void distro_stats_list_free(struct distro_stats **distros)
+{
+       if (distros) {
+               while (*distros) {
+                       distro_stats_free(*distros);
+                       distros++;
+               }
+       }
+}
+
 static void version_stats_free(struct version_stats *version)
 {
        struct distro_stats **distros;
@@ -364,7 +381,7 @@ static void package_stats_free(struct package_stats *package)
                }
                free(package->versions);
        }
-
+       distro_stats_list_free(package->distros);
        free(package->name);
        free(package);
 }