shaba/ostree
1
0
Fork 0
mirror of https://github.com/ostreedev/ostree.git synced 2024-12-23 21:35:26 +03:00
Code Issues Projects Releases Wiki Activity

metalink: Allow NULL for "out" params in metalink requests

Browse Source 
Caller may not be interested in all the outbound params, particularly
"fetching_sync_uri".
This commit is contained in:
Matthew Barnes 2015-06-10 14:37:42 -04:00 committed by Giuseppe Scrivano
parent 3515e01f6a
commit ebef43eabe
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/libostree/ostree-metalink.c
View File

@ -648,8 +648,10 @@ ostree_metalink_request_finish (OstreeMetalink *self,
if (g_task_propagate_boolean ((GTask*)result, error)) if (g_task_propagate_boolean ((GTask*)result, error))
{ {
g_assert_cmpint (request->current_url_index, <, request->urls->len); g_assert_cmpint (request->current_url_index, <, request->urls->len);
*out_target_uri = request->urls->pdata[request->current_url_index]; if (out_target_uri != NULL)
*out_data = g_strdup (request->result); *out_target_uri = request->urls->pdata[request->current_url_index];
if (out_data != NULL)
*out_data = g_strdup (request->result);
return TRUE; return TRUE;
} }
else else
@ -708,7 +710,9 @@ _ostree_metalink_request_sync (OstreeMetalink *self,
data.out_data = out_data; data.out_data = out_data;
data.loop = loop; data.loop = loop;
data.error = error; 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->metalink = g_object_ref (self);
request->urls = g_ptr_array_new_with_free_func ((GDestroyNotify) soup_uri_free); request->urls = g_ptr_array_new_with_free_func ((GDestroyNotify) soup_uri_free);