return NULL;
}
-static void **list_add_list(void **list1, void **list2)
-{
- int n1, n2, n;
- void **list;
-
- n1 = list_length(list1);
- n2 = list_length(list2);
-
- n = n1 + n2 + 1;
-
- list = malloc(sizeof(void *)*(n+1));
-
- memcpy(list, list1, n1*sizeof(void *));
- memcpy(list+n1, list2, n2*sizeof(void *));
-
- list[n1+n2] = NULL;
-
- free(list1);
-
- return list;
-}
-
#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 *package_status)
+ const char *pkg_status)
{
struct json_object *o_next;
- char *url = malloc(strlen(archive_url)+
- strlen(QUERY_GET_PUBLISHED_BINARIES)+
- strlen("&status=")+
- 9+
- 1);
+ char *url;
json_object *o;
void **result = NULL;
+ url = malloc(strlen(archive_url)+
+ strlen(QUERY_GET_PUBLISHED_BINARIES)+
+ (pkg_status ? strlen("&status=")+strlen(pkg_status) : 0)+
+ 1);
+
strcpy(url, archive_url);
strcat(url, QUERY_GET_PUBLISHED_BINARIES);
- if (package_status) {
+ if (pkg_status) {
strcat(url, "&status=");
- strcat(url, package_status);
+ strcat(url, pkg_status);
}
while (url) {
if (!o)
break;
- result = list_add_list(result,
- (void **)json_object_to_bpph_list(o));
+ result = list_append_list(result,
+ (void **)json_object_to_bpph_list(o));
o_next = json_object_object_get(o, "next_collection_link");