cleanup

[platform/upstream/glib.git] / gio / gdatainputstream.h

diff --git a/gio/gdatainputstream.h b/gio/gdatainputstream.h
index e5724d5..8304156 100644 (file)
--- a/gio/gdatainputstream.h
+++ b/gio/gdatainputstream.h
@@ -13,20 +13,18 @@
  * 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/>.
  *
  * Author: Alexander Larsson <alexl@redhat.com>
  */
 
+#ifndef __G_DATA_INPUT_STREAM_H__
+#define __G_DATA_INPUT_STREAM_H__
+
 #if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
 #error "Only <gio/gio.h> can be included directly."
 #endif
 
-#ifndef __G_DATA_INPUT_STREAM_H__
-#define __G_DATA_INPUT_STREAM_H__
-
 #include <gio/gbufferedinputstream.h>
 
 G_BEGIN_DECLS
@@ -68,71 +66,102 @@ struct _GDataInputStreamClass
   void (*_g_reserved5) (void);
 };
 
+GLIB_AVAILABLE_IN_ALL
 GType                  g_data_input_stream_get_type             (void) G_GNUC_CONST;
+GLIB_AVAILABLE_IN_ALL
 GDataInputStream *     g_data_input_stream_new                  (GInputStream            *base_stream);
 
+GLIB_AVAILABLE_IN_ALL
 void                   g_data_input_stream_set_byte_order       (GDataInputStream        *stream,
                                                                  GDataStreamByteOrder     order);
+GLIB_AVAILABLE_IN_ALL
 GDataStreamByteOrder   g_data_input_stream_get_byte_order       (GDataInputStream        *stream);
+GLIB_AVAILABLE_IN_ALL
 void                   g_data_input_stream_set_newline_type     (GDataInputStream        *stream,
                                                                  GDataStreamNewlineType   type);
+GLIB_AVAILABLE_IN_ALL
 GDataStreamNewlineType g_data_input_stream_get_newline_type     (GDataInputStream        *stream);
+GLIB_AVAILABLE_IN_ALL
 guchar                 g_data_input_stream_read_byte            (GDataInputStream        *stream,
                                                                  GCancellable            *cancellable,
                                                                  GError                 **error);
+GLIB_AVAILABLE_IN_ALL
 gint16                 g_data_input_stream_read_int16           (GDataInputStream        *stream,
                                                                  GCancellable            *cancellable,
                                                                  GError                 **error);
+GLIB_AVAILABLE_IN_ALL
 guint16                g_data_input_stream_read_uint16          (GDataInputStream        *stream,
                                                                  GCancellable            *cancellable,
                                                                  GError                 **error);
+GLIB_AVAILABLE_IN_ALL
 gint32                 g_data_input_stream_read_int32           (GDataInputStream        *stream,
                                                                  GCancellable            *cancellable,
                                                                  GError                 **error);
+GLIB_AVAILABLE_IN_ALL
 guint32                g_data_input_stream_read_uint32          (GDataInputStream        *stream,
                                                                  GCancellable            *cancellable,
                                                                  GError                 **error);
+GLIB_AVAILABLE_IN_ALL
 gint64                 g_data_input_stream_read_int64           (GDataInputStream        *stream,
                                                                  GCancellable            *cancellable,
                                                                  GError                 **error);
+GLIB_AVAILABLE_IN_ALL
 guint64                g_data_input_stream_read_uint64          (GDataInputStream        *stream,
                                                                  GCancellable            *cancellable,
                                                                  GError                 **error);
+GLIB_AVAILABLE_IN_ALL
 char *                 g_data_input_stream_read_line            (GDataInputStream        *stream,
                                                                  gsize                   *length,
                                                                  GCancellable            *cancellable,
                                                                  GError                 **error);
+GLIB_AVAILABLE_IN_2_30
+char *                 g_data_input_stream_read_line_utf8       (GDataInputStream        *stream,
+                                                                gsize                   *length,
+                                                                GCancellable            *cancellable,
+                                                                GError                 **error);
+GLIB_AVAILABLE_IN_ALL
 void                   g_data_input_stream_read_line_async      (GDataInputStream        *stream,
                                                                  gint                     io_priority,
                                                                  GCancellable            *cancellable,
                                                                  GAsyncReadyCallback      callback,
                                                                  gpointer                 user_data);
+GLIB_AVAILABLE_IN_ALL
 char *                 g_data_input_stream_read_line_finish     (GDataInputStream        *stream,
                                                                  GAsyncResult            *result,
                                                                  gsize                   *length,
                                                                  GError                 **error);
+GLIB_AVAILABLE_IN_2_30
+char *                 g_data_input_stream_read_line_finish_utf8(GDataInputStream        *stream,
+                                                                 GAsyncResult            *result,
+                                                                 gsize                   *length,
+                                                                 GError                 **error);
+GLIB_AVAILABLE_IN_ALL
 char *                 g_data_input_stream_read_until           (GDataInputStream        *stream,
                                                                  const gchar             *stop_chars,
                                                                  gsize                   *length,
                                                                  GCancellable            *cancellable,
                                                                  GError                 **error);
+GLIB_AVAILABLE_IN_ALL
 void                   g_data_input_stream_read_until_async     (GDataInputStream        *stream,
                                                                  const gchar             *stop_chars,
                                                                  gint                     io_priority,
                                                                  GCancellable            *cancellable,
                                                                  GAsyncReadyCallback      callback,
                                                                  gpointer                 user_data);
+GLIB_AVAILABLE_IN_ALL
 char *                 g_data_input_stream_read_until_finish    (GDataInputStream        *stream,
                                                                  GAsyncResult            *result,
                                                                  gsize                   *length,
                                                                  GError                 **error);
 
+GLIB_AVAILABLE_IN_ALL
 char *                 g_data_input_stream_read_upto            (GDataInputStream        *stream,
                                                                  const gchar             *stop_chars,
                                                                  gssize                   stop_chars_len,
                                                                  gsize                   *length,
                                                                  GCancellable            *cancellable,
                                                                  GError                 **error);
+GLIB_AVAILABLE_IN_ALL
 void                   g_data_input_stream_read_upto_async      (GDataInputStream        *stream,
                                                                  const gchar             *stop_chars,
                                                                  gssize                   stop_chars_len,
@@ -140,6 +169,7 @@ void                   g_data_input_stream_read_upto_async      (GDataInputStrea
                                                                  GCancellable            *cancellable,
                                                                  GAsyncReadyCallback      callback,
                                                                  gpointer                 user_data);
+GLIB_AVAILABLE_IN_ALL
 char *                 g_data_input_stream_read_upto_finish     (GDataInputStream        *stream,
                                                                  GAsyncResult            *result,
                                                                  gsize                   *length,