X-Git-Url: http://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Fppastats.c;fp=src%2Fppastats.c;h=3a4b0ef41fe2bb6963df933463edc168128e0332;hb=486c6a0380edcdedbed9b3d27427f5a5c6b8ae45;hp=70f6c6fa979d5ec00c05e75fb4fef2057082ca06;hpb=cacd81cd1065cf9a145bb2fbe66c383ad3c90206;p=ppastats.git diff --git a/src/ppastats.c b/src/ppastats.c index 70f6c6f..3a4b0ef 100644 --- a/src/ppastats.c +++ b/src/ppastats.c @@ -137,25 +137,26 @@ 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) +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 *item; - cur = totals; - while (*cur) { - item = *cur; + if (totals) { + cur = totals; + while (*cur) { + item = *cur; + + if (item->date.tm_year == total->date.tm_year && + item->date.tm_mon == total->date.tm_mon && + item->date.tm_mday == total->date.tm_mday) { + item->count += total->count; + return totals; + } - if (item->date.tm_year == total->date.tm_year && - item->date.tm_mon == total->date.tm_mon && - item->date.tm_mday == total->date.tm_mday) { - item->count += total->count; - return totals; + cur++; } - - cur++; } item = malloc(sizeof(struct daily_download_total)); @@ -165,16 +166,12 @@ add_total(struct daily_download_total **totals, list_add((void **)totals, (void *)item); } -struct daily_download_total ** -add_totals(struct daily_download_total **total1, - struct daily_download_total **total2) +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; - if (!total1) - return total2; - result = total1; cur = total2; while (*cur) { @@ -249,12 +246,16 @@ create_ppa_stats(const char *owner, ppastats->download_count += count; totals = get_daily_download_totals(h->self_link); - ppastats->daily_download_totals + + ppastats->daily_download_totals = add_totals(ppastats->daily_download_totals, totals); - if (ppastats->daily_download_totals != totals) - daily_download_total_list_free(totals); + package->daily_download_totals + = add_totals(package->daily_download_totals, + totals); + + daily_download_total_list_free(totals); h_cur++; } @@ -337,5 +338,7 @@ void ppa_stats_free(struct ppa_stats *ppastats) free(ppastats->owner); free(ppastats->name); + daily_download_total_list_free(ppastats->daily_download_totals); + free(ppastats); }