diff options
| author | Giuseppe Scrivano <gscrivan@redhat.com> | 2014-11-06 14:57:25 +0100 |
|---|---|---|
| committer | Colin Walters <walters@verbum.org> | 2014-11-12 21:20:28 -0500 |
| commit | c2bc99bc16793eea4c4ced4e96db500afa23591e (patch) | |
| tree | 7700f933a2d7299077b98b14af5c4ad4ed228773 | |
| parent | 5546c4d2fc5f804854c4ff3e1d31b7c951e26825 (diff) | |
| download | ostree-c2bc99bc16793eea4c4ced4e96db500afa23591e.tar.gz | |
ostree-fetcher: Remove _ostree_fetcher_request_uri_to_stream function
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| -rw-r--r-- | src/libostree/ostree-fetcher.c | 22 | ||||
| -rw-r--r-- | src/libostree/ostree-fetcher.h | 11 |
2 files changed, 11 insertions, 22 deletions
diff --git a/src/libostree/ostree-fetcher.c b/src/libostree/ostree-fetcher.c index c9f178be..8567006a 100644 --- a/src/libostree/ostree-fetcher.c +++ b/src/libostree/ostree-fetcher.c @@ -619,8 +619,8 @@ _ostree_fetcher_request_uri_with_partial_finish (OstreeFetcher *self, return g_object_ref (pending->out_tmpfile); } -void -_ostree_fetcher_stream_uri_async (OstreeFetcher *self, +static void +ostree_fetcher_stream_uri_async (OstreeFetcher *self, SoupURI *uri, guint64 max_size, GCancellable *cancellable, @@ -633,7 +633,7 @@ _ostree_fetcher_stream_uri_async (OstreeFetcher *self, pending = ostree_fetcher_request_uri_internal (self, uri, TRUE, max_size, cancellable, callback, user_data, - _ostree_fetcher_stream_uri_async); + ostree_fetcher_stream_uri_async); if (SOUP_IS_REQUEST_HTTP (pending->request)) { @@ -646,15 +646,15 @@ _ostree_fetcher_stream_uri_async (OstreeFetcher *self, on_request_sent, pending); } -GInputStream * -_ostree_fetcher_stream_uri_finish (OstreeFetcher *self, +static GInputStream * +ostree_fetcher_stream_uri_finish (OstreeFetcher *self, GAsyncResult *result, GError **error) { GSimpleAsyncResult *simple; OstreeFetcherPendingURI *pending; - g_return_val_if_fail (g_simple_async_result_is_valid (result, (GObject*)self, _ostree_fetcher_stream_uri_async), FALSE); + g_return_val_if_fail (g_simple_async_result_is_valid (result, (GObject*)self, ostree_fetcher_stream_uri_async), FALSE); simple = G_SIMPLE_ASYNC_RESULT (result); if (g_simple_async_result_propagate_error (simple, error)) @@ -711,7 +711,7 @@ fetch_uri_sync_on_complete (GObject *object, { FetchUriSyncData *data = user_data; - data->result_stream = _ostree_fetcher_stream_uri_finish ((OstreeFetcher*)object, + data->result_stream = ostree_fetcher_stream_uri_finish ((OstreeFetcher*)object, result, data->error); g_main_loop_quit (data->loop); } @@ -744,10 +744,10 @@ _ostree_fetcher_contents_membuf_sync (OstreeFetcher *fetcher, data.loop = loop; data.error = error; - _ostree_fetcher_stream_uri_async (fetcher, uri, - max_size, - cancellable, - fetch_uri_sync_on_complete, &data); + ostree_fetcher_stream_uri_async (fetcher, uri, + max_size, + cancellable, + fetch_uri_sync_on_complete, &data); run_mainloop_monitor_fetcher (&data); if (!data.result_stream) diff --git a/src/libostree/ostree-fetcher.h b/src/libostree/ostree-fetcher.h index 5dee1523..2d3f6c0e 100644 --- a/src/libostree/ostree-fetcher.h +++ b/src/libostree/ostree-fetcher.h @@ -76,17 +76,6 @@ GFile *_ostree_fetcher_request_uri_with_partial_finish (OstreeFetcher *self, GAsyncResult *result, GError **error); -void _ostree_fetcher_stream_uri_async (OstreeFetcher *self, - SoupURI *uri, - guint64 max_size, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data); - -GInputStream *_ostree_fetcher_stream_uri_finish (OstreeFetcher *self, - GAsyncResult *result, - GError **error); - gboolean _ostree_fetcher_contents_membuf_sync (OstreeFetcher *fetcher, SoupURI *uri, gboolean add_nul, |