packaging/ostree
1
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ostree-fetcher: make _ostree_fetcher_stream_uri_sync private

Browse Source 
Rename _ostree_fetcher_contents_membuf_sync to
ostree_fetcher_request_uri_to_membuf and drop unused argument
user_data.

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
This commit is contained in:
Giuseppe Scrivano authored and Colin Walters committed 2014-11-12 21:20:28 -05:00
1 parent c2bc99bc16
commit a5491f98cb
4 files changed
+37 -51
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/libostree/ostree-fetcher.c
+10 -21
View File
@@ -692,18 +692,9 @@ typedef struct
GInputStream *result_stream;
GMainLoop *loop;
GError **error;
gpointer user_data;
}
FetchUriSyncData;
static gboolean
run_mainloop_monitor_fetcher (FetchUriSyncData *data)
{
g_main_loop_run (data->loop);
return TRUE;
}
static void
fetch_uri_sync_on_complete (GObject *object,
GAsyncResult *result,
@@ -717,16 +708,15 @@ fetch_uri_sync_on_complete (GObject *object,
}
gboolean
_ostree_fetcher_contents_membuf_sync (OstreeFetcher *fetcher,
SoupURI *uri,
gboolean add_nul,
gboolean allow_noent,
GBytes **out_contents,
GMainLoop *loop,
gpointer user_data,
guint64 max_size,
GCancellable *cancellable,
GError **error)
_ostree_fetcher_request_uri_to_membuf (OstreeFetcher *fetcher,
SoupURI *uri,
gboolean add_nul,
gboolean allow_noent,
GBytes **out_contents,
GMainLoop *loop,
guint64 max_size,
GCancellable *cancellable,
GError **error)
{
gboolean ret = FALSE;
const guint8 nulchar = 0;
@@ -740,7 +730,6 @@ _ostree_fetcher_contents_membuf_sync (OstreeFetcher *fetcher,
if (g_cancellable_set_error_if_cancelled (cancellable, error))
return FALSE;
data.user_data = user_data;
data.loop = loop;
data.error = error;
@@ -749,7 +738,7 @@ _ostree_fetcher_contents_membuf_sync (OstreeFetcher *fetcher,
cancellable,
fetch_uri_sync_on_complete, &data);
run_mainloop_monitor_fetcher (&data);
g_main_loop_run (loop);
if (!data.result_stream)
{
if (allow_noent)