X-Git-Url: https://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Flp_json.c;fp=src%2Flp_json.c;h=6034120aacd8aae88c25ad297e098bfcdcfa64f1;hb=c1699160bcf64cf0b559c713a22720183a9f8934;hp=6514cfe37f9d5e0dfb9bbe42d3f65652d326864e;hpb=967d20c38c65689c96a0276e6f916b4f8e2617de;p=ppastats.git

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 ;
 			}
 		}