luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-11-13 04:46:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1454-follow-ups' into 'master'

Browse Source 
Minor API fixes

See merge request GNOME/gvdb!1
This commit is contained in:
Georges Basile Stavracas Neto 2018-08-16 15:13:18 +00:00
commit 2d462bf661
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gvdb-reader.c
View File

@ -332,7 +332,7 @@ gvdb_table_list_from_item (GvdbTable *table,
/** /**
* gvdb_table_get_names: * gvdb_table_get_names:
* @table: a #GvdbTable * @table: a #GvdbTable
* @length: the number of items returned, or %NULL * @length: (optional): the number of items returned, or %NULL
* *
* Gets a list of all names contained in @table. * Gets a list of all names contained in @table.
* *
@ -344,11 +344,11 @@ gvdb_table_list_from_item (GvdbTable *table,
* above calls in the case of the corrupted file. Note also that the * above calls in the case of the corrupted file. Note also that the
* returned strings may not be utf8. * returned strings may not be utf8.
* *
* Returns: a %NULL-terminated list of strings, of length @length * Returns: (array length=length): a %NULL-terminated list of strings, of length @length
**/ **/
gchar ** gchar **
gvdb_table_get_names (GvdbTable *table, gvdb_table_get_names (GvdbTable *table,
gint *length) gsize *length)
{ {
gchar **names; gchar **names;
gint n_names; gint n_names;
@ -462,7 +462,7 @@ gvdb_table_get_names (GvdbTable *table,
{ {
GPtrArray *fixed_names; GPtrArray *fixed_names;
fixed_names = g_ptr_array_new (); fixed_names = g_ptr_array_sized_new (n_names);
for (i = 0; i < n_names; i++) for (i = 0; i < n_names; i++)
if (names[i] != NULL) if (names[i] != NULL)
g_ptr_array_add (fixed_names, names[i]); g_ptr_array_add (fixed_names, names[i]);
@ -474,7 +474,10 @@ gvdb_table_get_names (GvdbTable *table,
} }
if (length) if (length)
*length = n_names; {
G_STATIC_ASSERT (sizeof (*length) >= sizeof (n_names));
*length = n_names;
}
return names; return names;
} }

2
gvdb-reader.h
View File

@ -38,7 +38,7 @@ G_GNUC_INTERNAL
void gvdb_table_free (GvdbTable *table); void gvdb_table_free (GvdbTable *table);
G_GNUC_INTERNAL G_GNUC_INTERNAL
gchar ** gvdb_table_get_names (GvdbTable *table, gchar ** gvdb_table_get_names (GvdbTable *table,
gint *length); gsize *length);
G_GNUC_INTERNAL G_GNUC_INTERNAL
gchar ** gvdb_table_list (GvdbTable *table, gchar ** gvdb_table_list (GvdbTable *table,
const gchar *key); const gchar *key);