diff options
| author | Ryan Lortie <desrt@desrt.ca> | 2011-01-25 18:26:35 -0500 |
|---|---|---|
| committer | Ryan Lortie <desrt@desrt.ca> | 2011-01-25 18:26:35 -0500 |
| commit | b1c5eacbbe32de475dbcd35f42769a0476aef88e (patch) | |
| tree | 99ae380d78eeca18667a9965f5ca6b3f80de104e /gvdb | |
| parent | 4f050332838d37a5e78753f3268ca2dedd024b9c (diff) | |
| parent | 03b6b9fb9775387c3ec5eedb9e5d2152d6468147 (diff) | |
| download | dconf-b1c5eacbbe32de475dbcd35f42769a0476aef88e.tar.gz | |
Merge remote branch 'gvdb/master'
Diffstat (limited to 'gvdb')
| -rw-r--r-- | gvdb/gvdb-reader.c | 4 | ||||
| -rw-r--r-- | gvdb/gvdb-reader.h | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/gvdb/gvdb-reader.c b/gvdb/gvdb-reader.c index f49ff4e..264e87d 100644 --- a/gvdb/gvdb-reader.c +++ b/gvdb/gvdb-reader.c @@ -230,7 +230,7 @@ gvdb_table_check_name (GvdbTable *file, return FALSE; parent = guint32_from_le (item->parent); - if (key_length == 0 && parent == -1) + if (key_length == 0 && parent == 0xffffffffu) return TRUE; if G_LIKELY (parent < file->n_hash_items && this_size > 0) @@ -340,7 +340,7 @@ gvdb_table_list (GvdbTable *file, const guint32_le *list; gchar **strv; guint length; - gint i; + guint i; if ((item = gvdb_table_lookup (file, key, 'L')) == NULL) return NULL; diff --git a/gvdb/gvdb-reader.h b/gvdb/gvdb-reader.h index e75c69c..e6921e9 100644 --- a/gvdb/gvdb-reader.h +++ b/gvdb/gvdb-reader.h @@ -26,6 +26,8 @@ typedef struct _GvdbTable GvdbTable; +G_BEGIN_DECLS + G_GNUC_INTERNAL GvdbTable * gvdb_table_new (const gchar *filename, gboolean trusted, @@ -65,6 +67,7 @@ typedef gboolean (*GvdbWalkOpenFunc) (const g typedef void (*GvdbWalkCloseFunc) (gsize name_len, gpointer user_data); +G_GNUC_INTERNAL void gvdb_table_walk (GvdbTable *table, const gchar *key, GvdbWalkOpenFunc open_func, @@ -72,5 +75,6 @@ void gvdb_table_walk (GvdbTab GvdbWalkCloseFunc close_func, gpointer user_data); +G_END_DECLS #endif /* __gvdb_reader_h__ */ |