renaming to bpph

diff --git a/src/fcache.c b/src/fcache.c
index 1e10a19..acc2e7a 100644 (file)
--- a/src/fcache.c
+++ b/src/fcache.c
@@ -83,17 +83,17 @@ char *fcache_get(const char *key)
        }
 
        content = file_get_content(path);
-       
+
        if (content)
                log_debug(_("file cache hit %s"), key);
        else
                log_debug(_("file cache miss %s %s"), key, path);
-       
+
        free(path);
-       
+
        return content;
 }
-       
+
 void fcache_put(const char *key, char *value)
 {
        char *path, *dir, *tmp;

diff --git a/src/http.c b/src/http.c
index 4b7b27f..4baceef 100644 (file)
--- a/src/http.c
+++ b/src/http.c
@@ -151,9 +151,8 @@ char *get_url_content(const char *url, unsigned int use_cache)
        if (use_cache)
                content = fcache_get(url + 7);
 
-       if (!content) {
+       if (!content)
                content = fetch_url(url);
-       }
 
        if (use_cache && content)
                fcache_put(url + 7, content);

diff --git a/src/lp.c b/src/lp.c
index c0c2b90..99cf9b2 100644 (file)
--- a/src/lp.c
+++ b/src/lp.c
@@ -52,9 +52,7 @@ void distro_series_free(struct distro_series *d)
        }
 }
 
-void
-binary_package_publishing_history_free \
-(struct binary_package_publishing_history *b)
+void binary_package_publishing_history_free(struct bpph *b)
 {
        if (b) {
                free(b->binary_package_name);
@@ -65,31 +63,31 @@ binary_package_publishing_history_free \
        }
 }
 
-struct binary_package_publishing_history *
+struct bpph *
 binary_package_publishing_history_new(const char *binary_package_name,
                                      const char *binary_package_version,
                                      const char *distro_arch_series_link,
                                      const char *self_link,
                                      int architecture_specific)
 {
-       struct binary_package_publishing_history *b;
+       struct bpph *h;
 
-       b = malloc(sizeof(struct binary_package_publishing_history));
+       h = malloc(sizeof(struct bpph));
 
-       b->binary_package_name = strdup(binary_package_name);
-       b->binary_package_version = strdup(binary_package_version);
-       b->distro_arch_series_link = strdup(distro_arch_series_link);
-       b->self_link = strdup(self_link);
-       b->architecture_specific = architecture_specific;
+       h->binary_package_name = strdup(binary_package_name);
+       h->binary_package_version = strdup(binary_package_version);
+       h->distro_arch_series_link = strdup(distro_arch_series_link);
+       h->self_link = strdup(self_link);
+       h->architecture_specific = architecture_specific;
 
-       return b;
+       return h;
 }
 
 void
 binary_package_publishing_history_list_free\
-(struct binary_package_publishing_history **list)
+(struct bpph **list)
 {
-       struct binary_package_publishing_history **l_cur = list;
+       struct bpph **l_cur = list;
 
        while (*l_cur) {
                binary_package_publishing_history_free(*l_cur);

diff --git a/src/lp.h b/src/lp.h
index bb0b983..76dc303 100644 (file)
--- a/src/lp.h
+++ b/src/lp.h
@@ -31,7 +31,8 @@ struct daily_download_total {
        struct tm date;
 };
 
-struct binary_package_publishing_history {
+/* (b)inary (p)ackage (p)ublishing (h)istory */
+struct bpph {
        char *binary_package_name;
        char *binary_package_version;
        char *distro_arch_series_link;
@@ -72,11 +73,9 @@ distro_arch_series_new(const char *display_name,
 
 void distro_arch_series_free(struct distro_arch_series *);
 
-void
-binary_package_publishing_history_free
-(struct binary_package_publishing_history *b);
+void binary_package_publishing_history_free(struct bpph *b);
 
-struct binary_package_publishing_history *
+struct bpph *
 binary_package_publishing_history_new(const char *binary_package_name,
                                      const char *binary_package_version,
                                      const char *distro_arch_series_link,
@@ -84,7 +83,7 @@ binary_package_publishing_history_new(const char *binary_package_name,
                                      int architecture_specific);
 
 void binary_package_publishing_history_list_free
-(struct binary_package_publishing_history **list);
+(struct bpph **list);
 
 
 char *get_archive_url(const char *owner, const char  *ppa);

diff --git a/src/lp_json.c b/src/lp_json.c
index 561ca06..6514cfe 100644 (file)
--- a/src/lp_json.c
+++ b/src/lp_json.c
@@ -27,7 +27,7 @@
 #include "lp_json.h"
 #include "lp_ws.h"
 
-struct binary_package_publishing_history *
+struct bpph *
 json_object_to_binary_package_publishing_history(json_object *o)
 {
        const char *binary_package_name;
@@ -117,13 +117,11 @@ struct distro_series *json_object_to_distro_series(json_object *o)
                                 displayname);
 }
 
-struct binary_package_publishing_history * *
-json_object_to_binary_package_publishing_history_list(json_object *o)
+struct bpph **json_object_to_bpph_list(json_object *o)
 {
        json_object *o_entries;
        int i, n, i2;
-       struct binary_package_publishing_history **entries;
-       struct binary_package_publishing_history *h;
+       struct bpph **entries, *h;
        const struct distro_arch_series *distro;
 
        o_entries = json_object_object_get(o, "entries");

diff --git a/src/lp_json.h b/src/lp_json.h
index 7f1cdab..3b7f553 100644 (file)
--- a/src/lp_json.h
+++ b/src/lp_json.h
@@ -24,11 +24,9 @@
 
 #include "lp.h"
 
-struct binary_package_publishing_history *
-json_object_to_binary_package_publishing_history(json_object * o);
+struct bpph *json_object_to_bpph(json_object *o);
 
-struct binary_package_publishing_history * *
-json_object_to_binary_package_publishing_history_list(json_object *o);
+struct bpph **json_object_to_bpph_list(json_object *o);
 
 struct distro_arch_series *json_object_to_distro_arch_series(json_object *o);
 struct distro_series *json_object_to_distro_series(json_object *o);

diff --git a/src/lp_ws.c b/src/lp_ws.c
index 6010922..2044371 100644 (file)
--- a/src/lp_ws.c
+++ b/src/lp_ws.c
@@ -58,12 +58,7 @@ static json_object *get_json_object(const char *url)
        return NULL;
 }
 
-#define json_object_to_bpph_list \
-json_object_to_binary_package_publishing_history_list
-
-struct binary_package_publishing_history * *
-get_binary_package_publishing_history_list(const char *archive_url,
-                                          const char *pkg_status)
+struct bpph **get_bpph_list(const char *archive_url, const char *pkg_status)
 {
        struct json_object *o_next;
        char *url;
@@ -102,7 +97,7 @@ get_binary_package_publishing_history_list(const char *archive_url,
                json_object_put(o);
        }
 
-       return (struct binary_package_publishing_history **)result;
+       return (struct bpph **)result;
 }
 
 int get_download_count(const char *archive_url)
@@ -139,7 +134,7 @@ const struct distro_arch_series *get_distro_arch_series(const char *url)
                return (struct distro_arch_series *)distro;
 
        content = get_url_content(url, 1);
-       
+
        if (!content)
                return NULL;
 

diff --git a/src/lp_ws.h b/src/lp_ws.h
index 6e1990f..4676939 100644 (file)
--- a/src/lp_ws.h
+++ b/src/lp_ws.h
@@ -22,9 +22,8 @@
 
 #include "lp.h"
 
-struct binary_package_publishing_history * *
-get_binary_package_publishing_history_list(const char *archive_url,
-                                          const char *package_status);
+struct bpph **
+get_bpph_list(const char *archive_url, const char *package_status);
 
 int get_download_count(const char *archive_url);
 

diff --git a/src/ppastats.c b/src/ppastats.c
index 9f6ddbe..4f321ac 100644 (file)
--- a/src/ppastats.c
+++ b/src/ppastats.c
@@ -234,7 +234,7 @@ create_ppa_stats(const char *owner,
                 const char *package_status)
 {
        struct ppa_stats *ppa;
-       struct binary_package_publishing_history **history, **h_cur, *h;
+       struct bpph **history, **h_cur, *h;
        char *ppa_url, *pkg_name, *pkg_version;
        struct package_stats *pkg;
        struct version_stats *version;
@@ -246,8 +246,7 @@ create_ppa_stats(const char *owner,
        struct daily_download_total **totals;
 
        ppa_url = get_archive_url(owner, ppa_name);
-       history = get_binary_package_publishing_history_list(ppa_url,
-                                                            package_status);
+       history = get_bpph_list(ppa_url, package_status);
        free(ppa_url);
 
        if (!history) {