From c1699160bcf64cf0b559c713a22720183a9f8934 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Orsini <jeanfi@gmail.com>
Date: Thu, 10 May 2012 15:37:57 +0000
Subject: [PATCH] renaming

---
 src/lp.c       | 19 ++++++++-----------
 src/lp.h       | 17 +++++++----------
 src/lp_json.c  | 21 ++++++++++-----------
 src/ppastats.c |  2 +-
 4 files changed, 26 insertions(+), 33 deletions(-)

diff --git a/src/lp.c b/src/lp.c
index 99cf9b2..b8c24f1 100644
--- a/src/lp.c
+++ b/src/lp.c
@@ -52,7 +52,7 @@ void distro_series_free(struct distro_series *d)
 	}
 }
 
-void binary_package_publishing_history_free(struct bpph *b)
+void bpph_free(struct bpph *b)
 {
 	if (b) {
 		free(b->binary_package_name);
@@ -63,12 +63,11 @@ void binary_package_publishing_history_free(struct bpph *b)
 	}
 }
 
-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 bpph *bpph_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 bpph *h;
 
@@ -83,14 +82,12 @@ binary_package_publishing_history_new(const char *binary_package_name,
 	return h;
 }
 
-void
-binary_package_publishing_history_list_free\
-(struct bpph **list)
+void bpph_list_free(struct bpph **list)
 {
 	struct bpph **l_cur = list;
 
 	while (*l_cur) {
-		binary_package_publishing_history_free(*l_cur);
+		bpph_free(*l_cur);
 		l_cur++;
 	}
 
diff --git a/src/lp.h b/src/lp.h
index 76dc303..0603742 100644
--- a/src/lp.h
+++ b/src/lp.h
@@ -73,18 +73,15 @@ distro_arch_series_new(const char *display_name,
 
 void distro_arch_series_free(struct distro_arch_series *);
 
-void binary_package_publishing_history_free(struct bpph *b);
+void bpph_free(struct bpph *b);
 
-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);
-
-void binary_package_publishing_history_list_free
-(struct bpph **list);
+struct bpph *bpph_new(const char *binary_package_name,
+		      const char *binary_package_version,
+		      const char *distro_arch_series_link,
+		      const char *self_link,
+		      int architecture_specific);
 
+void bpph_list_free(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 6514cfe..6034120 100644
--- a/src/lp_json.c
+++ b/src/lp_json.c
@@ -27,8 +27,7 @@
 #include "lp_json.h"
 #include "lp_ws.h"
 
-struct bpph *
-json_object_to_binary_package_publishing_history(json_object *o)
+struct bpph *json_object_to_bpph(json_object *o)
 {
 	const char *binary_package_name;
 	const char *binary_package_version;
@@ -54,11 +53,11 @@ json_object_to_binary_package_publishing_history(json_object *o)
 	else
 		architecture_specific = 0;
 
-	return binary_package_publishing_history_new(binary_package_name,
-						     binary_package_version,
-						     distro_arch_series_link,
-						     self_link,
-						     architecture_specific);
+	return bpph_new(binary_package_name,
+			binary_package_version,
+			distro_arch_series_link,
+			self_link,
+			architecture_specific);
 }
 
 struct distro_arch_series *json_object_to_distro_arch_series(json_object *o)
@@ -132,18 +131,18 @@ struct bpph **json_object_to_bpph_list(json_object *o)
 	n = json_object_array_length(o_entries);
 
 	entries = malloc
-		(sizeof(struct binary_package_publishing_history *)*(n+1));
+		(sizeof(struct bpph *)*(n+1));
 
 	for (i = 0, i2 = 0; i < n; i++) {
-		h = json_object_to_binary_package_publishing_history
-			(json_object_array_get_idx(o_entries, i));
+		h = json_object_to_bpph(json_object_array_get_idx(o_entries,
+								  i));
 
 		if (!h->architecture_specific) {
 			distro = get_distro_arch_series
 				(h->distro_arch_series_link);
 
 			if (!distro || !distro->is_nominated_arch_indep) {
-				binary_package_publishing_history_free(h);
+				bpph_free(h);
 				continue ;
 			}
 		}
diff --git a/src/ppastats.c b/src/ppastats.c
index 4f321ac..4d8b874 100644
--- a/src/ppastats.c
+++ b/src/ppastats.c
@@ -307,7 +307,7 @@ create_ppa_stats(const char *owner,
 		daily_download_total_list_free(totals);
 	}
 
-	binary_package_publishing_history_list_free(history);
+	bpph_list_free(history);
 
 	return ppa;
 }
-- 
2.7.4