glib r6342 - trunk/gio

[alexl svn gnome org]

Author: alexl
Date: Mon Jan 21 15:11:56 2008
New Revision: 6342
URL: http://svn.gnome.org/viewvc/glib?rev=6342&view=rev

Log:
2008-01-21  Alexander Larsson  <alexl redhat com>

        * gfileinputstream.[ch]:
        * gfileoutputstream.[ch]:
        * gio.symbols:
	Remove duplicated GSeekable functions. (#509990)
	Just use the g_seekable_xxx() calls instead.




Modified:
   trunk/gio/ChangeLog
   trunk/gio/gfileinputstream.c
   trunk/gio/gfileinputstream.h
   trunk/gio/gfileoutputstream.c
   trunk/gio/gfileoutputstream.h
   trunk/gio/gio.symbols

Modified: trunk/gio/gfileinputstream.c
==============================================================================
--- trunk/gio/gfileinputstream.c	(original)
+++ trunk/gio/gfileinputstream.c	Mon Jan 21 15:11:56 2008
@@ -264,15 +264,7 @@
   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 @@
   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 @@
   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,

Modified: trunk/gio/gfileinputstream.h
==============================================================================
--- trunk/gio/gfileinputstream.h	(original)
+++ trunk/gio/gfileinputstream.h	Mon Jan 21 15:11:56 2008
@@ -107,14 +107,6 @@
 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

Modified: trunk/gio/gfileoutputstream.c
==============================================================================
--- trunk/gio/gfileoutputstream.c	(original)
+++ trunk/gio/gfileoutputstream.c	Mon Jan 21 15:11:56 2008
@@ -309,15 +309,7 @@
   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 @@
   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 @@
   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 @@
 				    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 @@
   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,

Modified: trunk/gio/gfileoutputstream.h
==============================================================================
--- trunk/gio/gfileoutputstream.h	(original)
+++ trunk/gio/gfileoutputstream.h	Mon Jan 21 15:11:56 2008
@@ -115,18 +115,6 @@
 						   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
 

Modified: trunk/gio/gio.symbols
==============================================================================
--- trunk/gio/gio.symbols	(original)
+++ trunk/gio/gio.symbols	Mon Jan 21 15:11:56 2008
@@ -393,9 +393,6 @@
 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_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