summaryrefslogtreecommitdiff
path: root/src/libostree/ostree-metalink.c
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2015-06-10 14:37:42 -0400
committerGiuseppe Scrivano <gscrivan@redhat.com>2015-06-26 11:02:24 +0200
commitebef43eabe260333efaaffc19859d6ef4d98a3d4 (patch)
tree0b1cec18310c2c89c7ae1a846a206a3026fc2b56 /src/libostree/ostree-metalink.c
parent3515e01f6a4967e7ad67409dd429747d05f032ab (diff)
downloadostree-ebef43eabe260333efaaffc19859d6ef4d98a3d4.tar.gz
metalink: Allow NULL for "out" params in metalink requests
Caller may not be interested in all the outbound params, particularly "fetching_sync_uri".
Diffstat (limited to 'src/libostree/ostree-metalink.c')
-rw-r--r--src/libostree/ostree-metalink.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/libostree/ostree-metalink.c b/src/libostree/ostree-metalink.c
index cbe859f0..56bd12f1 100644
--- a/src/libostree/ostree-metalink.c
+++ b/src/libostree/ostree-metalink.c
@@ -648,8 +648,10 @@ ostree_metalink_request_finish (OstreeMetalink *self,
if (g_task_propagate_boolean ((GTask*)result, error))
{
g_assert_cmpint (request->current_url_index, <, request->urls->len);
- *out_target_uri = request->urls->pdata[request->current_url_index];
- *out_data = g_strdup (request->result);
+ if (out_target_uri != NULL)
+ *out_target_uri = request->urls->pdata[request->current_url_index];
+ if (out_data != NULL)
+ *out_data = g_strdup (request->result);
return TRUE;
}
else
@@ -708,7 +710,9 @@ _ostree_metalink_request_sync (OstreeMetalink *self,
data.out_data = out_data;
data.loop = loop;
data.error = error;
- *fetching_sync_uri = _ostree_metalink_get_uri (self);
+
+ if (fetching_sync_uri != NULL)
+ *fetching_sync_uri = _ostree_metalink_get_uri (self);
request->metalink = g_object_ref (self);
request->urls = g_ptr_array_new_with_free_func ((GDestroyNotify) soup_uri_free);