From eb4a1640a2717633da8719274f2514b90b5279c2 Mon Sep 17 00:00:00 2001 From: Alexander Larsson Date: Mon, 21 Jan 2008 15:11:56 +0000 Subject: [PATCH] Remove duplicated GSeekable functions. (#509990) Just use the 2008-01-21 Alexander Larsson * gfileinputstream.[ch]: * gfileoutputstream.[ch]: * gio.symbols: Remove duplicated GSeekable functions. (#509990) Just use the g_seekable_xxx() calls instead. svn path=/trunk/; revision=6342 --- gio/ChangeLog | 8 ++++++ gio/gfileinputstream.c | 40 +++-------------------------- gio/gfileinputstream.h | 8 ------ gio/gfileoutputstream.c | 57 ++++------------------------------------- gio/gfileoutputstream.h | 12 --------- gio/gio.symbols | 8 ------ 6 files changed, 16 insertions(+), 117 deletions(-) diff --git a/gio/ChangeLog b/gio/ChangeLog index e7759153f..b4eb59315 100644 --- a/gio/ChangeLog +++ b/gio/ChangeLog @@ -1,3 +1,11 @@ +2008-01-21 Alexander Larsson + + * gfileinputstream.[ch]: + * gfileoutputstream.[ch]: + * gio.symbols: + Remove duplicated GSeekable functions. (#509990) + Just use the g_seekable_xxx() calls instead. + 2008-01-21 Matthias Clasen * glocal*.c: diff --git a/gio/gfileinputstream.c b/gio/gfileinputstream.c index 75607a5db..9558b5585 100644 --- a/gio/gfileinputstream.c +++ b/gio/gfileinputstream.c @@ -264,15 +264,7 @@ g_file_input_stream_query_info_finish (GFileInputStream *stream, return class->query_info_finish (stream, result, error); } -/** - * g_file_input_stream_tell: - * @stream: a #GFileInputStream. - * - * Gets the current position in the stream. - * - * Returns: a #goffset with the position in the stream. - **/ -goffset +static goffset g_file_input_stream_tell (GFileInputStream *stream) { GFileInputStreamClass *class; @@ -295,15 +287,7 @@ g_file_input_stream_seekable_tell (GSeekable *seekable) return g_file_input_stream_tell (G_FILE_INPUT_STREAM (seekable)); } -/** - * g_file_input_stream_can_seek: - * @stream: a #GFileInputStream. - * - * Checks if a file input stream can be seeked. - * - * Returns: %TRUE if stream can be seeked. %FALSE otherwise. - **/ -gboolean +static gboolean g_file_input_stream_can_seek (GFileInputStream *stream) { GFileInputStreamClass *class; @@ -330,25 +314,7 @@ g_file_input_stream_seekable_can_seek (GSeekable *seekable) return g_file_input_stream_can_seek (G_FILE_INPUT_STREAM (seekable)); } -/** - * g_file_input_stream_seek: - * @stream: a #GFileInputStream. - * @offset: a #goffset to seek. - * @type: a #GSeekType. - * @cancellable: optional #GCancellable object, %NULL to ignore. - * @error: a #GError location to store the error occuring, or - * %NULL to ignore. - * - * Seeks in the file input stream. - * - * If @cancellable is not %NULL, then the operation can be cancelled by - * triggering the cancellable object from another thread. If the operation - * was cancelled, the error %G_IO_ERROR_CANCELLED will be set. - * - * Returns: %TRUE if the stream was successfully seeked to the position. - * %FALSE on error. - **/ -gboolean +static gboolean g_file_input_stream_seek (GFileInputStream *stream, goffset offset, GSeekType type, diff --git a/gio/gfileinputstream.h b/gio/gfileinputstream.h index 5f1f89100..1abc46eb8 100644 --- a/gio/gfileinputstream.h +++ b/gio/gfileinputstream.h @@ -107,14 +107,6 @@ void g_file_input_stream_query_info_async (GFileInputStream *stream, GFileInfo *g_file_input_stream_query_info_finish (GFileInputStream *stream, GAsyncResult *result, GError **error); -goffset g_file_input_stream_tell (GFileInputStream *stream); -gboolean g_file_input_stream_can_seek (GFileInputStream *stream); -gboolean g_file_input_stream_seek (GFileInputStream *stream, - goffset offset, - GSeekType type, - GCancellable *cancellable, - GError **error); - G_END_DECLS diff --git a/gio/gfileoutputstream.c b/gio/gfileoutputstream.c index 999aeff23..611e8467b 100644 --- a/gio/gfileoutputstream.c +++ b/gio/gfileoutputstream.c @@ -309,15 +309,7 @@ g_file_output_stream_get_etag (GFileOutputStream *stream) return etag; } -/** - * g_file_output_stream_tell: - * @stream: a #GFileOutputStream. - * - * Gets the current location within the stream. - * - * Returns: a #goffset of the location within the stream. - **/ -goffset +static goffset g_file_output_stream_tell (GFileOutputStream *stream) { GFileOutputStreamClass *class; @@ -340,15 +332,7 @@ g_file_output_stream_seekable_tell (GSeekable *seekable) return g_file_output_stream_tell (G_FILE_OUTPUT_STREAM (seekable)); } -/** - * g_file_output_stream_can_seek: - * @stream: a #GFileOutputStream. - * - * Checks if the stream can be seeked. - * - * Returns: %TRUE if seeking is supported by the stream. - **/ -gboolean +static gboolean g_file_output_stream_can_seek (GFileOutputStream *stream) { GFileOutputStreamClass *class; @@ -375,19 +359,7 @@ g_file_output_stream_seekable_can_seek (GSeekable *seekable) return g_file_output_stream_can_seek (G_FILE_OUTPUT_STREAM (seekable)); } -/** - * g_file_output_stream_seek: - * @stream: a #GFileOutputStream. - * @offset: a #goffset to seek. - * @type: a #GSeekType. - * @cancellable: optional #GCancellable object, %NULL to ignore. - * @error: a #GError, %NULL to ignore. - * - * Seeks to a location in a file output stream. - * - * Returns: %TRUE if the seek was successful. %FALSE otherwise. - **/ -gboolean +static gboolean g_file_output_stream_seek (GFileOutputStream *stream, goffset offset, GSeekType type, @@ -437,15 +409,7 @@ g_file_output_stream_seekable_seek (GSeekable *seekable, offset, type, cancellable, error); } -/** - * g_file_output_stream_can_truncate: - * @stream: a #GFileOutputStream. - * - * Checks if the stream can be truncated. - * - * Returns: %TRUE if stream can be truncated. - **/ -gboolean +static gboolean g_file_output_stream_can_truncate (GFileOutputStream *stream) { GFileOutputStreamClass *class; @@ -472,18 +436,7 @@ g_file_output_stream_seekable_can_truncate (GSeekable *seekable) return g_file_output_stream_can_truncate (G_FILE_OUTPUT_STREAM (seekable)); } -/** - * g_file_output_stream_truncate: - * @stream: a #GFileOutputStream. - * @size: a #goffset to truncate the stream at. - * @cancellable: optional #GCancellable object, %NULL to ignore. - * @error: a #GError, %NULL to ignore. - * - * Truncates a file output stream. - * - * Returns: %TRUE if @stream is truncated successfully. - **/ -gboolean +static gboolean g_file_output_stream_truncate (GFileOutputStream *stream, goffset size, GCancellable *cancellable, diff --git a/gio/gfileoutputstream.h b/gio/gfileoutputstream.h index 31627226d..aebb3c240 100644 --- a/gio/gfileoutputstream.h +++ b/gio/gfileoutputstream.h @@ -115,18 +115,6 @@ GFileInfo *g_file_output_stream_query_info_finish (GFileOutputStream *stream GAsyncResult *result, GError **error); char * g_file_output_stream_get_etag (GFileOutputStream *stream); -goffset g_file_output_stream_tell (GFileOutputStream *stream); -gboolean g_file_output_stream_can_seek (GFileOutputStream *stream); -gboolean g_file_output_stream_seek (GFileOutputStream *stream, - goffset offset, - GSeekType type, - GCancellable *cancellable, - GError **error); -gboolean g_file_output_stream_can_truncate (GFileOutputStream *stream); -gboolean g_file_output_stream_truncate (GFileOutputStream *stream, - goffset size, - GCancellable *cancellable, - GError **error); G_END_DECLS diff --git a/gio/gio.symbols b/gio/gio.symbols index d15e53d3f..3e093aec7 100644 --- a/gio/gio.symbols +++ b/gio/gio.symbols @@ -393,9 +393,6 @@ g_file_input_stream_get_type G_GNUC_CONST g_file_input_stream_query_info g_file_input_stream_query_info_async g_file_input_stream_query_info_finish -g_file_input_stream_tell -g_file_input_stream_can_seek -g_file_input_stream_seek #endif #endif @@ -426,11 +423,6 @@ g_file_output_stream_query_info g_file_output_stream_query_info_async g_file_output_stream_query_info_finish g_file_output_stream_get_etag -g_file_output_stream_tell -g_file_output_stream_can_seek -g_file_output_stream_seek -g_file_output_stream_can_truncate -g_file_output_stream_truncate #endif #endif