cleanup

[platform/upstream/glib.git] / gio / gpollableinputstream.c

diff --git a/gio/gpollableinputstream.c b/gio/gpollableinputstream.c
index b2c0b88..45947a4 100644 (file)
--- a/gio/gpollableinputstream.c
+++ b/gio/gpollableinputstream.c
@@ -13,9 +13,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Public License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
@@ -32,7 +30,7 @@
  * @include: gio/gio.h
  * @see_also: #GInputStream, #GPollableOutputStream, #GFileDescriptorBased
  *
- * #GPollableInputStream is implemented by #GInputStream<!-- -->s that
+ * #GPollableInputStream is implemented by #GInputStreams that
  * can be polled for readiness to read. This can be used when
  * interfacing with a non-GIO API that expects
  * UNIX-file-descriptor-style asynchronous I/O rather than GIO-style.
@@ -161,8 +159,8 @@ g_pollable_input_stream_default_read_nonblocking (GPollableInputStream  *stream,
 /**
  * g_pollable_input_stream_read_nonblocking:
  * @stream: a #GPollableInputStream
- * @buffer: a buffer to read data into (which should be at least @count
- *     bytes long).
+ * @buffer: (array length=count) (element-type guint8): a buffer to
+ *     read data into (which should be at least @count bytes long).
  * @count: the number of bytes you want to read
  * @cancellable: (allow-none): a #GCancellable, or %NULL
  * @error: #GError for error reporting, or %NULL to ignore.
@@ -180,7 +178,7 @@ g_pollable_input_stream_default_read_nonblocking (GPollableInputStream  *stream,
  * to having been cancelled.
  *
  * Virtual: read_nonblocking
- * Return value: the number of bytes read, or -1 on error (including
+ * Returns: the number of bytes read, or -1 on error (including
  *   %G_IO_ERROR_WOULD_BLOCK).
  */
 gssize
@@ -219,106 +217,3 @@ g_pollable_input_stream_read_nonblocking (GPollableInputStream  *stream,
 
   return res;
 }
-
-/* GPollableSource */
-
-typedef struct {
-  GSource       source;
-
-  GObject      *stream;
-} GPollableSource;
-
-static gboolean
-pollable_source_prepare (GSource *source,
-                        gint    *timeout)
-{
-  *timeout = -1;
-  return FALSE;
-}
-
-static gboolean
-pollable_source_check (GSource *source)
-{
-  return FALSE;
-}
-
-static gboolean
-pollable_source_dispatch (GSource     *source,
-                         GSourceFunc  callback,
-                         gpointer     user_data)
-{
-  GPollableSourceFunc func = (GPollableSourceFunc)callback;
-  GPollableSource *pollable_source = (GPollableSource *)source;
-
-  return (*func) (pollable_source->stream, user_data);
-}
-
-static void
-pollable_source_finalize (GSource *source)
-{
-  GPollableSource *pollable_source = (GPollableSource *)source;
-
-  g_object_unref (pollable_source->stream);
-}
-
-static gboolean
-pollable_source_closure_callback (GObject  *stream,
-                                 gpointer  data)
-{
-  GClosure *closure = data;
-
-  GValue param = G_VALUE_INIT;
-  GValue result_value = G_VALUE_INIT;
-  gboolean result;
-
-  g_value_init (&result_value, G_TYPE_BOOLEAN);
-
-  g_value_init (&param, G_TYPE_OBJECT);
-  g_value_set_object (&param, stream);
-
-  g_closure_invoke (closure, &result_value, 1, &param, NULL);
-
-  result = g_value_get_boolean (&result_value);
-  g_value_unset (&result_value);
-  g_value_unset (&param);
-
-  return result;
-}
-
-static GSourceFuncs pollable_source_funcs =
-{
-  pollable_source_prepare,
-  pollable_source_check,
-  pollable_source_dispatch,
-  pollable_source_finalize,
-  (GSourceFunc)pollable_source_closure_callback,
-  (GSourceDummyMarshal)g_cclosure_marshal_generic,
-};
-
-/**
- * g_pollable_source_new:
- * @pollable_stream: the stream associated with the new source
- *
- * Utility method for #GPollableInputStream and #GPollableOutputStream
- * implementations. Creates a new #GSource that expects a callback of
- * type #GPollableSourceFunc. The new source does not actually do
- * anything on its own; use g_source_add_child_source() to add other
- * sources to it to cause it to trigger.
- *
- * Return value: (transfer full): the new #GSource.
- *
- * Since: 2.28
- */
-GSource *
-g_pollable_source_new (GObject *pollable_stream)
-{
-  GSource *source;
-  GPollableSource *pollable_source;
-
-  source = g_source_new (&pollable_source_funcs, sizeof (GPollableSource));
-  g_source_set_name (source, "GPollableSource");
-  pollable_source = (GPollableSource *)source;
-  pollable_source->stream = g_object_ref (pollable_stream);
-
-  return source;
-}