luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-09-07 08:28:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'gvdb/master' into update-gvdb

Browse Source 
Minor merge conflicts in gvdb-reader.c with the documentation.
This commit is contained in:
Philip Withnall
2018-08-13 15:35:52 +01:00
parent 438547641f 57962aac85
commit c9834f234d
4 changed files with 275 additions and 285 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
gio/gvdb/gvdb-reader.h
View File

@@ -24,27 +24,21 @@
typedef struct _GvdbTable GvdbTable;
typedef gpointer (*GvdbRefFunc) (gpointer data);
G_BEGIN_DECLS
G_GNUC_INTERNAL
GvdbTable * gvdb_table_new_from_bytes (GBytes *bytes,
gboolean trusted,
GError **error);
G_GNUC_INTERNAL
GvdbTable * gvdb_table_new (const gchar *filename,
gboolean trusted,
GError **error);
G_GNUC_INTERNAL
GvdbTable * gvdb_table_new_from_data (const void *data,
gsize data_len,
gboolean trusted,
gpointer user_data,
GvdbRefFunc ref,
GDestroyNotify unref,
GError **error);
void gvdb_table_free (GvdbTable *table);
G_GNUC_INTERNAL
GvdbTable * gvdb_table_ref (GvdbTable *table);
G_GNUC_INTERNAL
void gvdb_table_unref (GvdbTable *table);
gchar ** gvdb_table_get_names (GvdbTable *table,
gint *length);
G_GNUC_INTERNAL
gchar ** gvdb_table_list (GvdbTable *table,
const gchar *key);
@@ -61,28 +55,9 @@ GVariant * gvdb_table_get_value (GvdbTab
G_GNUC_INTERNAL
gboolean gvdb_table_has_value (GvdbTable *table,
const gchar *key);
G_GNUC_INTERNAL
gboolean gvdb_table_is_valid (GvdbTable *table);
typedef void (*GvdbWalkValueFunc) (const gchar *name,
gsize name_len,
GVariant *value,
gpointer user_data);
typedef gboolean (*GvdbWalkOpenFunc) (const gchar *name,
gsize name_len,
gpointer user_data);
typedef void (*GvdbWalkCloseFunc) (gsize name_len,
gpointer user_data);
G_GNUC_INTERNAL
void gvdb_table_walk (GvdbTable *table,
const gchar *key,
GvdbWalkOpenFunc open_func,
GvdbWalkValueFunc value_func,
GvdbWalkCloseFunc close_func,
gpointer user_data);
G_END_DECLS
#endif /* __gvdb_reader_h__ */