luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-05-17 19:21:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

gobject: Fix various compiler warnings when compiling with G_DISABLE_ASSERT

Browse Source 
Mostly unused variables which are only used in a g_assert() call
otherwise.

Signed-off-by: Philip Withnall <withnall@endlessm.com>

Helps: #1708
This commit is contained in:
Philip Withnall 2019-03-05 12:24:01 +00:00
parent faa1d63cab
commit 3d3ca9f1fe
6 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gobject/gboxed.c
View File

@ -100,7 +100,7 @@ _g_boxed_type_init (void)
NULL, /* value_table */ NULL, /* value_table */
}; };
const GTypeFundamentalInfo finfo = { G_TYPE_FLAG_DERIVABLE, }; const GTypeFundamentalInfo finfo = { G_TYPE_FLAG_DERIVABLE, };
GType type; GType type G_GNUC_UNUSED /* when compiling with G_DISABLE_ASSERT */;
/* G_TYPE_BOXED /* G_TYPE_BOXED
*/ */

2
gobject/genums.c
View File

@ -113,7 +113,7 @@ _g_enum_types_init (void)
static const GTypeFundamentalInfo finfo = { static const GTypeFundamentalInfo finfo = {
G_TYPE_FLAG_CLASSED | G_TYPE_FLAG_DERIVABLE, G_TYPE_FLAG_CLASSED | G_TYPE_FLAG_DERIVABLE,
}; };
GType type; GType type G_GNUC_UNUSED /* when compiling with G_DISABLE_ASSERT */;
g_return_if_fail (initialized == FALSE); g_return_if_fail (initialized == FALSE);
initialized = TRUE; initialized = TRUE;

2
gobject/gobject.c
View File

@ -381,7 +381,7 @@ _g_object_type_init (void)
"p", /* lcopy_format */ "p", /* lcopy_format */
g_value_object_lcopy_value, /* lcopy_value */ g_value_object_lcopy_value, /* lcopy_value */
}; };
GType type; GType type G_GNUC_UNUSED /* when compiling with G_DISABLE_ASSERT */;
g_return_if_fail (initialized == FALSE); g_return_if_fail (initialized == FALSE);
initialized = TRUE; initialized = TRUE;

7
gobject/gparamspecs.c
View File

@ -1191,11 +1191,16 @@ void
_g_param_spec_types_init (void) _g_param_spec_types_init (void)
{ {
const guint n_types = 23; const guint n_types = 23;
GType type, *spec_types, *spec_types_bound; GType type, *spec_types;
#ifndef G_DISABLE_ASSERT
GType *spec_types_bound;
#endif
g_param_spec_types = g_new0 (GType, n_types); g_param_spec_types = g_new0 (GType, n_types);
spec_types = g_param_spec_types; spec_types = g_param_spec_types;
#ifndef G_DISABLE_ASSERT
spec_types_bound = g_param_spec_types + n_types; spec_types_bound = g_param_spec_types + n_types;
#endif
/* G_TYPE_PARAM_CHAR /* G_TYPE_PARAM_CHAR
*/ */

2
gobject/gtype.c
View File

@ -4362,7 +4362,7 @@ gobject_init (void)
const gchar *env_string; const gchar *env_string;
GTypeInfo info; GTypeInfo info;
TypeNode *node; TypeNode *node;
GType type; GType type G_GNUC_UNUSED /* when compiling with G_DISABLE_ASSERT */;
/* Ensure GLib is initialized first, see /* Ensure GLib is initialized first, see
* https://bugzilla.gnome.org/show_bug.cgi?id=756139 * https://bugzilla.gnome.org/show_bug.cgi?id=756139

2
gobject/gvaluetypes.c
View File

@ -435,7 +435,7 @@ _g_value_types_init (void)
NULL, /* value_table */ NULL, /* value_table */
}; };
const GTypeFundamentalInfo finfo = { G_TYPE_FLAG_DERIVABLE, }; const GTypeFundamentalInfo finfo = { G_TYPE_FLAG_DERIVABLE, };
GType type; GType type G_GNUC_UNUSED /* when compiling with G_DISABLE_ASSERT */;
/* G_TYPE_CHAR / G_TYPE_UCHAR /* G_TYPE_CHAR / G_TYPE_UCHAR
*/ */