luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-26 12:12:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Avoid an unused variable warning

Browse Source 
Also, clean up some whitespace
This commit is contained in:
Matthias Clasen 2011-05-01 20:43:04 -04:00
parent ef5d4d55fe
commit ddcb095fb2
1 changed files with 179 additions and 176 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

129
glib/tests/keyfile.c
View File

@ -5,7 +5,7 @@
static GKeyFile * static GKeyFile *
load_data (const gchar *data, load_data (const gchar *data,
GKeyFileFlags flags) GKeyFileFlags flags)
{ {
GKeyFile *keyfile; GKeyFile *keyfile;
GError *error = NULL; GError *error = NULL;
@ -18,8 +18,8 @@ load_data (const gchar *data,
static void static void
check_error (GError **error, check_error (GError **error,
GQuark domain, GQuark domain,
gint code) gint code)
{ {
g_assert_error (*error, domain, code); g_assert_error (*error, domain, code);
g_error_free (*error); g_error_free (*error);
@ -34,9 +34,9 @@ check_no_error (GError **error)
static void static void
check_string_value (GKeyFile *keyfile, check_string_value (GKeyFile *keyfile,
const gchar *group, const gchar *group,
const gchar *key, const gchar *key,
const gchar *expected) const gchar *expected)
{ {
GError *error = NULL; GError *error = NULL;
gchar *value; gchar *value;
@ -50,10 +50,10 @@ check_string_value (GKeyFile *keyfile,
static void static void
check_locale_string_value (GKeyFile *keyfile, check_locale_string_value (GKeyFile *keyfile,
const gchar *group, const gchar *group,
const gchar *key, const gchar *key,
const gchar *locale, const gchar *locale,
const gchar *expected) const gchar *expected)
{ {
GError *error = NULL; GError *error = NULL;
gchar *value; gchar *value;
@ -67,9 +67,9 @@ check_locale_string_value (GKeyFile *keyfile,
static void static void
check_string_list_value (GKeyFile *keyfile, check_string_list_value (GKeyFile *keyfile,
const gchar *group, const gchar *group,
const gchar *key, const gchar *key,
...) ...)
{ {
gint i; gint i;
gchar *v, **value; gchar *v, **value;
@ -132,9 +132,9 @@ check_locale_string_list_value (GKeyFile *keyfile,
static void static void
check_integer_list_value (GKeyFile *keyfile, check_integer_list_value (GKeyFile *keyfile,
const gchar *group, const gchar *group,
const gchar *key, const gchar *key,
...) ...)
{ {
gint i; gint i;
gint v, *value; gint v, *value;
@ -164,9 +164,9 @@ check_integer_list_value (GKeyFile *keyfile,
static void static void
check_double_list_value (GKeyFile *keyfile, check_double_list_value (GKeyFile *keyfile,
const gchar *group, const gchar *group,
const gchar *key, const gchar *key,
...) ...)
{ {
gint i; gint i;
gdouble v, *value; gdouble v, *value;
@ -196,9 +196,9 @@ check_double_list_value (GKeyFile *keyfile,
static void static void
check_boolean_list_value (GKeyFile *keyfile, check_boolean_list_value (GKeyFile *keyfile,
const gchar *group, const gchar *group,
const gchar *key, const gchar *key,
...) ...)
{ {
gint i; gint i;
gboolean v, *value; gboolean v, *value;
@ -228,9 +228,9 @@ check_boolean_list_value (GKeyFile *keyfile,
static void static void
check_boolean_value (GKeyFile *keyfile, check_boolean_value (GKeyFile *keyfile,
const gchar *group, const gchar *group,
const gchar *key, const gchar *key,
gboolean expected) gboolean expected)
{ {
GError *error = NULL; GError *error = NULL;
gboolean value; gboolean value;
@ -242,9 +242,9 @@ check_boolean_value (GKeyFile *keyfile,
static void static void
check_integer_value (GKeyFile *keyfile, check_integer_value (GKeyFile *keyfile,
const gchar *group, const gchar *group,
const gchar *key, const gchar *key,
gint expected) gint expected)
{ {
GError *error = NULL; GError *error = NULL;
gint value; gint value;
@ -256,9 +256,9 @@ check_integer_value (GKeyFile *keyfile,
static void static void
check_double_value (GKeyFile *keyfile, check_double_value (GKeyFile *keyfile,
const gchar *group, const gchar *group,
const gchar *key, const gchar *key,
gdouble expected) gdouble expected)
{ {
GError *error = NULL; GError *error = NULL;
gdouble value; gdouble value;
@ -270,18 +270,18 @@ check_double_value (GKeyFile *keyfile,
static void static void
check_name (const gchar *what, check_name (const gchar *what,
const gchar *value, const gchar *value,
const gchar *expected, const gchar *expected,
gint position) gint position)
{ {
g_assert_cmpstr (value, ==, expected); g_assert_cmpstr (value, ==, expected);
} }
static void static void
check_length (const gchar *what, check_length (const gchar *what,
gint n_items, gint n_items,
gint length, gint length,
gint expected) gint expected)
{ {
g_assert_cmpint (n_items, ==, length); g_assert_cmpint (n_items, ==, length);
g_assert_cmpint (n_items, ==, expected); g_assert_cmpint (n_items, ==, expected);
@ -427,8 +427,8 @@ test_comments (void)
comment = g_key_file_get_comment (keyfile, "group3", NULL, &error); comment = g_key_file_get_comment (keyfile, "group3", NULL, &error);
check_error (&error, check_error (&error,
G_KEY_FILE_ERROR, G_KEY_FILE_ERROR,
G_KEY_FILE_ERROR_GROUP_NOT_FOUND); G_KEY_FILE_ERROR_GROUP_NOT_FOUND);
g_assert (comment == NULL); g_assert (comment == NULL);
g_key_file_free (keyfile); g_key_file_free (keyfile);
@ -901,8 +901,8 @@ test_group_names (void)
g_key_file_load_from_data (keyfile, data, -1, 0, &error); g_key_file_load_from_data (keyfile, data, -1, 0, &error);
g_key_file_free (keyfile); g_key_file_free (keyfile);
check_error (&error, check_error (&error,
G_KEY_FILE_ERROR, G_KEY_FILE_ERROR,
G_KEY_FILE_ERROR_PARSE); G_KEY_FILE_ERROR_PARSE);
/* ] in group name */ /* ] in group name */
data = "[a]b]\n" data = "[a]b]\n"
@ -911,8 +911,8 @@ test_group_names (void)
g_key_file_load_from_data (keyfile, data, -1, 0, &error); g_key_file_load_from_data (keyfile, data, -1, 0, &error);
g_key_file_free (keyfile); g_key_file_free (keyfile);
check_error (&error, check_error (&error,
G_KEY_FILE_ERROR, G_KEY_FILE_ERROR,
G_KEY_FILE_ERROR_PARSE); G_KEY_FILE_ERROR_PARSE);
/* control char in group name */ /* control char in group name */
data = "[a\tb]\n" data = "[a\tb]\n"
@ -921,8 +921,8 @@ test_group_names (void)
g_key_file_load_from_data (keyfile, data, -1, 0, &error); g_key_file_load_from_data (keyfile, data, -1, 0, &error);
g_key_file_free (keyfile); g_key_file_free (keyfile);
check_error (&error, check_error (&error,
G_KEY_FILE_ERROR, G_KEY_FILE_ERROR,
G_KEY_FILE_ERROR_PARSE); G_KEY_FILE_ERROR_PARSE);
/* empty group name */ /* empty group name */
data = "[]\n" data = "[]\n"
@ -931,8 +931,8 @@ test_group_names (void)
g_key_file_load_from_data (keyfile, data, -1, 0, &error); g_key_file_load_from_data (keyfile, data, -1, 0, &error);
g_key_file_free (keyfile); g_key_file_free (keyfile);
check_error (&error, check_error (&error,
G_KEY_FILE_ERROR, G_KEY_FILE_ERROR,
G_KEY_FILE_ERROR_PARSE); G_KEY_FILE_ERROR_PARSE);
/* Unicode in group name */ /* Unicode in group name */
data = "[\xc2\xbd]\n" data = "[\xc2\xbd]\n"
@ -948,6 +948,7 @@ test_group_names (void)
check_error (&error, check_error (&error,
G_KEY_FILE_ERROR, G_KEY_FILE_ERROR,
G_KEY_FILE_ERROR_GROUP_NOT_FOUND); G_KEY_FILE_ERROR_GROUP_NOT_FOUND);
g_assert (value == NULL);
g_key_file_free (keyfile); g_key_file_free (keyfile);
keyfile = g_key_file_new (); keyfile = g_key_file_new ();
@ -956,6 +957,7 @@ test_group_names (void)
check_error (&error, check_error (&error,
G_KEY_FILE_ERROR, G_KEY_FILE_ERROR,
G_KEY_FILE_ERROR_GROUP_NOT_FOUND); G_KEY_FILE_ERROR_GROUP_NOT_FOUND);
g_assert (value == NULL);
g_key_file_free (keyfile); g_key_file_free (keyfile);
keyfile = g_key_file_new (); keyfile = g_key_file_new ();
@ -964,6 +966,7 @@ test_group_names (void)
check_error (&error, check_error (&error,
G_KEY_FILE_ERROR, G_KEY_FILE_ERROR,
G_KEY_FILE_ERROR_GROUP_NOT_FOUND); G_KEY_FILE_ERROR_GROUP_NOT_FOUND);
g_assert (value == NULL);
g_key_file_free (keyfile); g_key_file_free (keyfile);
keyfile = g_key_file_new (); keyfile = g_key_file_new ();
@ -987,8 +990,8 @@ test_key_names (void)
g_key_file_load_from_data (keyfile, data, -1, 0, &error); g_key_file_load_from_data (keyfile, data, -1, 0, &error);
g_key_file_free (keyfile); g_key_file_free (keyfile);
check_error (&error, check_error (&error,
G_KEY_FILE_ERROR, G_KEY_FILE_ERROR,
G_KEY_FILE_ERROR_PARSE); G_KEY_FILE_ERROR_PARSE);
/* empty key name */ /* empty key name */
data = "[a]\n" data = "[a]\n"
@ -997,8 +1000,8 @@ test_key_names (void)
g_key_file_load_from_data (keyfile, data, -1, 0, &error); g_key_file_load_from_data (keyfile, data, -1, 0, &error);
g_key_file_free (keyfile); g_key_file_free (keyfile);
check_error (&error, check_error (&error,
G_KEY_FILE_ERROR, G_KEY_FILE_ERROR,
G_KEY_FILE_ERROR_PARSE); G_KEY_FILE_ERROR_PARSE);
/* empty key name */ /* empty key name */
data = "[a]\n" data = "[a]\n"
@ -1007,8 +1010,8 @@ test_key_names (void)
g_key_file_load_from_data (keyfile, data, -1, 0, &error); g_key_file_load_from_data (keyfile, data, -1, 0, &error);
g_key_file_free (keyfile); g_key_file_free (keyfile);
check_error (&error, check_error (&error,
G_KEY_FILE_ERROR, G_KEY_FILE_ERROR,
G_KEY_FILE_ERROR_PARSE); G_KEY_FILE_ERROR_PARSE);
/* bad locale suffix */ /* bad locale suffix */
data = "[a]\n" data = "[a]\n"
@ -1017,8 +1020,8 @@ test_key_names (void)
g_key_file_load_from_data (keyfile, data, -1, 0, &error); g_key_file_load_from_data (keyfile, data, -1, 0, &error);
g_key_file_free (keyfile); g_key_file_free (keyfile);
check_error (&error, check_error (&error,
G_KEY_FILE_ERROR, G_KEY_FILE_ERROR,
G_KEY_FILE_ERROR_PARSE); G_KEY_FILE_ERROR_PARSE);
/* initial space */ /* initial space */
data = "[a]\n" data = "[a]\n"
@ -1053,8 +1056,8 @@ test_key_names (void)
keyfile = g_key_file_new (); keyfile = g_key_file_new ();
g_key_file_load_from_data (keyfile, data, -1, 0, &error); g_key_file_load_from_data (keyfile, data, -1, 0, &error);
check_error (&error, check_error (&error,
G_KEY_FILE_ERROR, G_KEY_FILE_ERROR,
G_KEY_FILE_ERROR_PARSE); G_KEY_FILE_ERROR_PARSE);
g_key_file_free (keyfile); g_key_file_free (keyfile);
/* control char in key name */ /* control char in key name */
@ -1213,9 +1216,9 @@ test_reload_idempotency (void)
/* check that we only insert a single new line between groups */ /* check that we only insert a single new line between groups */
keyfile = g_key_file_new (); keyfile = g_key_file_new ();
g_key_file_load_from_data (keyfile, g_key_file_load_from_data (keyfile,
original_data, strlen(original_data), original_data, strlen(original_data),
G_KEY_FILE_KEEP_COMMENTS, G_KEY_FILE_KEEP_COMMENTS,
&error); &error);
check_no_error (&error); check_no_error (&error);
data1 = g_key_file_to_data (keyfile, &len1, &error); data1 = g_key_file_to_data (keyfile, &len1, &error);
@ -1224,9 +1227,9 @@ test_reload_idempotency (void)
keyfile = g_key_file_new (); keyfile = g_key_file_new ();
g_key_file_load_from_data (keyfile, g_key_file_load_from_data (keyfile,
data1, len1, data1, len1,
G_KEY_FILE_KEEP_COMMENTS, G_KEY_FILE_KEEP_COMMENTS,
&error); &error);
check_no_error (&error); check_no_error (&error);
data2 = g_key_file_to_data (keyfile, &len2, &error); data2 = g_key_file_to_data (keyfile, &len2, &error);