projects
/
ppastats.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
do not free list in the fct
[ppastats.git]
/
src
/
ppastats.c
diff --git
a/src/ppastats.c
b/src/ppastats.c
index
4232e53
..
56293d5
100644
(file)
--- a/
src/ppastats.c
+++ b/
src/ppastats.c
@@
-25,15
+25,15
@@
#include <string.h>
#include "list.h"
#include <string.h>
#include "list.h"
-#include "log.h"
#include "lp_ws.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)
{
#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) {
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;
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);
((void **)stats->packages, p);
+ free(stats->packages);
+ stats->packages = tmp;
return p;
}
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)
{
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) {
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;
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;
}
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 **cur = version->distros;
struct distro_stats *d;
+ struct distro_stats **tmp;
while (cur && *cur) {
d = *cur;
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);
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);
d);
+ free(version->distros);
+ version->distros = tmp;
return d;
}
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 **cur = distro->archs;
struct arch_stats *a;
+ struct arch_stats **tmp;
while (cur && *cur) {
a = *cur;
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;
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;
}
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)
{
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) {
struct daily_download_total *item;
if (totals) {
@@
-175,8
+183,12
@@
static struct daily_download_total **add_total
item = malloc(sizeof(struct daily_download_total));
memcpy(item, total, sizeof(struct daily_download_total));
item = malloc(sizeof(struct daily_download_total));
memcpy(item, total, sizeof(struct daily_download_total));
- re
turn
(struct daily_download_total **)
+ re
sult =
(struct daily_download_total **)
list_add((void **)totals, (void *)item);
list_add((void **)totals, (void *)item);
+
+ free(totals);
+
+ return result;
}
struct daily_download_total **add_totals
}
struct daily_download_total **add_totals
@@
-202,7
+214,7
@@
pkg_add_distro(struct package_stats *pkg,
int distro_count,
struct daily_download_total **ddts)
{
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;
pkg_distros = pkg->distros;
pkg_distro = NULL;
@@
-219,9
+231,11
@@
pkg_add_distro(struct package_stats *pkg,
if (!pkg_distro) {
pkg_distro = distro_stats_new(distro_name);
if (!pkg_distro) {
pkg_distro = distro_stats_new(distro_name);
- pkg->distros
+ tmp
= (struct distro_stats **)
list_add((void **)pkg->distros, (void *)pkg_distro);
= (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->download_count += distro_count;
@@
-270,12
+284,7
@@
create_ppa_stats(const char *owner,
h->self_link);
continue;
}
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
pkg_name = h->binary_package_name;
pkg_version = h->binary_package_version;
arch_series