[kdbus] KDBUS_ITEM_PAYLOAD_OFF items are (once again) relative to msg header

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

diff --git a/gio/ginputstream.h b/gio/ginputstream.h
index 8179529..e6879ec 100644 (file)
--- a/gio/ginputstream.h
+++ b/gio/ginputstream.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_INPUT_STREAM_H__
+#define __G_INPUT_STREAM_H__
+
 #if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
 #error "Only <gio/gio.h> can be included directly."
 #endif
 
-#ifndef __G_INPUT_STREAM_H__
-#define __G_INPUT_STREAM_H__
-
 #include <gio/giotypes.h>
 
 G_BEGIN_DECLS
@@ -111,26 +109,37 @@ struct _GInputStreamClass
   void (*_g_reserved5) (void);
 };
 
+GLIB_AVAILABLE_IN_ALL
 GType    g_input_stream_get_type      (void) G_GNUC_CONST;
 
+GLIB_AVAILABLE_IN_ALL
 gssize   g_input_stream_read          (GInputStream          *stream,
                                       void                  *buffer,
                                       gsize                  count,
                                       GCancellable          *cancellable,
                                       GError               **error);
+GLIB_AVAILABLE_IN_ALL
 gboolean g_input_stream_read_all      (GInputStream          *stream,
                                       void                  *buffer,
                                       gsize                  count,
                                       gsize                 *bytes_read,
                                       GCancellable          *cancellable,
                                       GError               **error);
+GLIB_AVAILABLE_IN_2_34
+GBytes  *g_input_stream_read_bytes    (GInputStream          *stream,
+                                      gsize                  count,
+                                      GCancellable          *cancellable,
+                                      GError               **error);
+GLIB_AVAILABLE_IN_ALL
 gssize   g_input_stream_skip          (GInputStream          *stream,
                                       gsize                  count,
                                       GCancellable          *cancellable,
                                       GError               **error);
+GLIB_AVAILABLE_IN_ALL
 gboolean g_input_stream_close         (GInputStream          *stream,
                                       GCancellable          *cancellable,
                                       GError               **error);
+GLIB_AVAILABLE_IN_ALL
 void     g_input_stream_read_async    (GInputStream          *stream,
                                       void                  *buffer,
                                       gsize                  count,
@@ -138,33 +147,68 @@ void     g_input_stream_read_async    (GInputStream          *stream,
                                       GCancellable          *cancellable,
                                       GAsyncReadyCallback    callback,
                                       gpointer               user_data);
+GLIB_AVAILABLE_IN_ALL
 gssize   g_input_stream_read_finish   (GInputStream          *stream,
                                       GAsyncResult          *result,
                                       GError               **error);
+
+GLIB_AVAILABLE_IN_2_44
+void     g_input_stream_read_all_async    (GInputStream          *stream,
+                                           void                  *buffer,
+                                           gsize                  count,
+                                           int                    io_priority,
+                                           GCancellable          *cancellable,
+                                           GAsyncReadyCallback    callback,
+                                           gpointer               user_data);
+GLIB_AVAILABLE_IN_2_44
+gboolean g_input_stream_read_all_finish   (GInputStream          *stream,
+                                           GAsyncResult          *result,
+                                           gsize                 *bytes_read,
+                                           GError               **error);
+
+GLIB_AVAILABLE_IN_2_34
+void     g_input_stream_read_bytes_async  (GInputStream          *stream,
+                                          gsize                  count,
+                                          int                    io_priority,
+                                          GCancellable          *cancellable,
+                                          GAsyncReadyCallback    callback,
+                                          gpointer               user_data);
+GLIB_AVAILABLE_IN_2_34
+GBytes  *g_input_stream_read_bytes_finish (GInputStream          *stream,
+                                          GAsyncResult          *result,
+                                          GError               **error);
+GLIB_AVAILABLE_IN_ALL
 void     g_input_stream_skip_async    (GInputStream          *stream,
                                       gsize                  count,
                                       int                    io_priority,
                                       GCancellable          *cancellable,
                                       GAsyncReadyCallback    callback,
                                       gpointer               user_data);
+GLIB_AVAILABLE_IN_ALL
 gssize   g_input_stream_skip_finish   (GInputStream          *stream,
                                       GAsyncResult          *result,
                                       GError               **error);
+GLIB_AVAILABLE_IN_ALL
 void     g_input_stream_close_async   (GInputStream          *stream,
                                       int                    io_priority,
                                       GCancellable          *cancellable,
                                       GAsyncReadyCallback    callback,
                                       gpointer               user_data);
+GLIB_AVAILABLE_IN_ALL
 gboolean g_input_stream_close_finish  (GInputStream          *stream,
                                       GAsyncResult          *result,
                                       GError               **error);
 
 /* For implementations: */
 
+GLIB_AVAILABLE_IN_ALL
 gboolean g_input_stream_is_closed     (GInputStream          *stream);
+GLIB_AVAILABLE_IN_ALL
 gboolean g_input_stream_has_pending   (GInputStream          *stream);
+GLIB_AVAILABLE_IN_ALL
 gboolean g_input_stream_set_pending   (GInputStream          *stream,
                                       GError               **error);
+GLIB_AVAILABLE_IN_ALL
 void     g_input_stream_clear_pending (GInputStream          *stream);
 
 G_END_DECLS