qulogic/pidgin

queuedoutputstream: Remove unused purple_queued_output_stream_push_bytes()

2017-06-19, Mike Ruprecht
35d3f5c5ffad
Parents 7c8688913c87
Children 17a23258d60a
queuedoutputstream: Remove unused purple_queued_output_stream_push_bytes()

Now that all usage of purple_queued_output_stream_push_bytes() has
been ported to instead use purple_queued_output_stream_push_bytes_async(),
the former can be removed, along with its related implementation.
This patch does so.
2 files changed, 1 insertions(+), 176 deletions(-)
  • +1 -165
    libpurple/queuedoutputstream.c
  • +0 -11
    libpurple/queuedoutputstream.h
    • --- a/libpurple/queuedoutputstream.c Mon May 28 15:46:46 2018 -0500
    +++ b/libpurple/queuedoutputstream.c Mon Jun 19 20:17:55 2017 -0500
    @@ -26,7 +26,6 @@
    struct _PurpleQueuedOutputStreamPrivate {
    GAsyncQueue *queue;
    - GBytes *next;
    gboolean pending_queued;
    };
    @@ -42,32 +41,17 @@
    G_ADD_PRIVATE(PurpleQueuedOutputStream))
    static void purple_queued_output_stream_dispose(GObject *object);
    -static gboolean purple_queued_output_stream_flush(GOutputStream *stream,
    - GCancellable *cancellable, GError **error);
    -static void purple_queued_output_stream_flush_async(GOutputStream *stream,
    - int io_priority, GCancellable *cancellable,
    - GAsyncReadyCallback callback, gpointer user_data);
    -static gboolean purple_queued_output_stream_flush_finish(GOutputStream *stream,
    - GAsyncResult *result, GError **error);
    -
    -static void purple_queued_output_stream_start_flush_async(GTask *task);
    static void purple_queued_output_stream_start_push_bytes_async(GTask *task);
    static void
    purple_queued_output_stream_class_init(PurpleQueuedOutputStreamClass *klass)
    {
    GObjectClass *object_class;
    - GOutputStreamClass *ostream_class;
    parent_class = g_type_class_peek_parent(klass);
    object_class = G_OBJECT_CLASS(klass);
    object_class->dispose = purple_queued_output_stream_dispose;
    -
    - ostream_class = G_OUTPUT_STREAM_CLASS(klass);
    - ostream_class->flush = purple_queued_output_stream_flush;
    - ostream_class->flush_async = purple_queued_output_stream_flush_async;
    - ostream_class->flush_finish = purple_queued_output_stream_flush_finish;
    }
    PurpleQueuedOutputStream *
    @@ -84,16 +68,6 @@
    return stream;
    }
    -void
    -purple_queued_output_stream_push_bytes(PurpleQueuedOutputStream *stream,
    - GBytes *bytes)
    -{
    - g_return_if_fail(PURPLE_QUEUED_OUTPUT_STREAM(stream));
    - g_return_if_fail(bytes != NULL);
    -
    - g_async_queue_push(stream->priv->queue, g_bytes_ref(bytes));
    -}
    -
    static void
    purple_queued_output_stream_init(PurpleQueuedOutputStream *stream)
    {
    @@ -108,147 +82,9 @@
    {
    PurpleQueuedOutputStream *stream = PURPLE_QUEUED_OUTPUT_STREAM(object);
    - /* Chain up first in case the stream is flushed */
    - G_OBJECT_CLASS(parent_class)->dispose(object);
    -
    g_clear_pointer(&stream->priv->queue, g_async_queue_unref);
    - g_clear_pointer(&stream->priv->next, g_bytes_unref);
    -}
    -
    -static gboolean
    -purple_queued_output_stream_flush(GOutputStream *stream,
    - GCancellable *cancellable, GError **error)
    -{
    - PurpleQueuedOutputStreamPrivate *priv;
    - GOutputStream *base_stream;
    - GBytes *bytes;
    - const void *buffer;
    - gsize count;
    - gsize bytes_written = 0;
    - gboolean ret = TRUE;
    -
    - priv = PURPLE_QUEUED_OUTPUT_STREAM(stream)->priv;
    - base_stream = g_filter_output_stream_get_base_stream(
    - G_FILTER_OUTPUT_STREAM(stream));
    -
    - do {
    - if (priv->next != NULL) {
    - bytes = priv->next;
    - priv->next = NULL;
    - } else {
    - bytes = g_async_queue_try_pop(priv->queue);
    - }
    -
    - if (bytes == NULL) {
    - break;
    - }
    -
    - buffer = g_bytes_get_data(bytes, &count);
    -
    - ret = g_output_stream_write_all(base_stream, buffer, count,
    - &bytes_written, cancellable, error);
    -
    - if (!ret) {
    - GBytes *queue_bytes;
    -
    - if (bytes_written > 0) {
    - queue_bytes = g_bytes_new_from_bytes(bytes,
    - bytes_written,
    - count - bytes_written);
    - } else {
    - queue_bytes = g_bytes_ref(bytes);
    - }
    -
    - priv->next = queue_bytes;
    - }
    -
    - g_bytes_unref(bytes);
    - } while (ret);
    -
    - return ret;
    -}
    -
    -static void
    -purple_queued_output_stream_flush_async_cb(GObject *source,
    - GAsyncResult *res, gpointer user_data)
    -{
    - GTask *task = user_data;
    - PurpleQueuedOutputStream *stream;
    - gssize written;
    - gsize size;
    - GBytes *old_bytes;
    - GError *error = NULL;
    - written = g_output_stream_write_bytes_finish(G_OUTPUT_STREAM(source),
    - res, &error);
    -
    - if (written < 0) {
    - g_task_return_error(task, error);
    - return;
    - }
    -
    - stream = PURPLE_QUEUED_OUTPUT_STREAM(g_task_get_source_object(task));
    - size = g_bytes_get_size(stream->priv->next);
    -
    - old_bytes = stream->priv->next;
    - stream->priv->next = NULL;
    -
    - if (size > (gsize)written) {
    - stream->priv->next = g_bytes_new_from_bytes(old_bytes,
    - written, size - written);
    - }
    -
    - g_bytes_unref(old_bytes);
    -
    - purple_queued_output_stream_start_flush_async(task);
    -}
    -
    -static void
    -purple_queued_output_stream_start_flush_async(GTask *task)
    -{
    - PurpleQueuedOutputStream *stream;
    - GOutputStream *base_stream;
    -
    - stream = PURPLE_QUEUED_OUTPUT_STREAM(g_task_get_source_object(task));
    - base_stream = g_filter_output_stream_get_base_stream(
    - G_FILTER_OUTPUT_STREAM(stream));
    -
    - if (stream->priv->next == NULL) {
    - stream->priv->next =
    - g_async_queue_try_pop(stream->priv->queue);
    -
    - if (stream->priv->next == NULL) {
    - g_task_return_boolean(task, TRUE);
    - return;
    - }
    - }
    -
    - g_output_stream_write_bytes_async(base_stream, stream->priv->next,
    - g_task_get_priority(task),
    - g_task_get_cancellable(task),
    - purple_queued_output_stream_flush_async_cb, task);
    -}
    -
    -static void
    -purple_queued_output_stream_flush_async(GOutputStream *stream,
    - int io_priority, GCancellable *cancellable,
    - GAsyncReadyCallback callback, gpointer user_data)
    -{
    - GTask *task;
    -
    - task = g_task_new(stream, cancellable, callback, user_data);
    - g_task_set_priority(task, io_priority);
    -
    - purple_queued_output_stream_start_flush_async(task);
    -}
    -
    -static gboolean
    -purple_queued_output_stream_flush_finish(GOutputStream *stream,
    - GAsyncResult *result, GError **error)
    -{
    - g_return_val_if_fail(g_task_is_valid(result, stream), FALSE);
    -
    - return g_task_propagate_boolean(G_TASK(result), error);
    + G_OBJECT_CLASS(parent_class)->dispose(object);
    }
    static void
    --- a/libpurple/queuedoutputstream.h Mon May 28 15:46:46 2018 -0500
    +++ b/libpurple/queuedoutputstream.h Mon Jun 19 20:17:55 2017 -0500
    @@ -96,17 +96,6 @@
    GOutputStream *base_stream);
    /*
    - * purple_queued_output_stream_push_bytes
    - * @stream: Stream to push bytes to
    - * @bytes: Bytes to queue
    - *
    - * Queues data to be output through the stream. Flush the stream to
    - * output this data.
    - */
    -void purple_queued_output_stream_push_bytes(PurpleQueuedOutputStream *stream,
    - GBytes *bytes);
    -
    -/*
    * purple_queued_output_stream_push_bytes_async
    * @stream: #PurpleQueuedOutputStream to push bytes to
    * @bytes: Bytes to queue