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

Bug 501166 - Warning message says IA__g_type_init instead of g_type_init

Browse Source
This commit is contained in:
Behdad Esfahbod 2009-12-19 11:46:19 +01:00
parent 9917024949
commit ccd33a4043
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gobject/gtype.c
View File

@ -124,12 +124,12 @@
else \ else \
g_error ("%s()%s`%s'", _fname, _action, _tname); \ g_error ("%s()%s`%s'", _fname, _action, _tname); \
}G_STMT_END }G_STMT_END
#define g_return_val_if_uninitialized(condition, init_function, return_value) G_STMT_START{ \ #define g_return_val_if_type_system_uninitialized(return_value) G_STMT_START{ \
if (!(condition)) \ if (G_UNLIKELY (!static_quark_type_flags)) \
{ \ { \
g_log (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL, \ g_log (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL, \
"%s: initialization assertion failed, use %s() prior to this function", \ "%s: You forgot to call g_type_init()", \
G_STRLOC, G_STRINGIFY (init_function)); \ G_STRLOC); \
return (return_value); \ return (return_value); \
} \ } \
}G_STMT_END }G_STMT_END
@ -2555,7 +2555,7 @@ g_type_register_fundamental (GType type_id,
{ {
TypeNode *node; TypeNode *node;
g_return_val_if_uninitialized (static_quark_type_flags, g_type_init, 0); g_return_val_if_type_system_uninitialized (0);
g_return_val_if_fail (type_id > 0, 0); g_return_val_if_fail (type_id > 0, 0);
g_return_val_if_fail (type_name != NULL, 0); g_return_val_if_fail (type_name != NULL, 0);
g_return_val_if_fail (info != NULL, 0); g_return_val_if_fail (info != NULL, 0);
@ -2666,7 +2666,7 @@ g_type_register_static (GType parent_type,
TypeNode *pnode, *node; TypeNode *pnode, *node;
GType type = 0; GType type = 0;
g_return_val_if_uninitialized (static_quark_type_flags, g_type_init, 0); g_return_val_if_type_system_uninitialized (0);
g_return_val_if_fail (parent_type > 0, 0); g_return_val_if_fail (parent_type > 0, 0);
g_return_val_if_fail (type_name != NULL, 0); g_return_val_if_fail (type_name != NULL, 0);
g_return_val_if_fail (info != NULL, 0); g_return_val_if_fail (info != NULL, 0);
@ -2721,7 +2721,7 @@ g_type_register_dynamic (GType parent_type,
TypeNode *pnode, *node; TypeNode *pnode, *node;
GType type; GType type;
g_return_val_if_uninitialized (static_quark_type_flags, g_type_init, 0); g_return_val_if_type_system_uninitialized (0);
g_return_val_if_fail (parent_type > 0, 0); g_return_val_if_fail (parent_type > 0, 0);
g_return_val_if_fail (type_name != NULL, 0); g_return_val_if_fail (type_name != NULL, 0);
g_return_val_if_fail (plugin != NULL, 0); g_return_val_if_fail (plugin != NULL, 0);
@ -3230,7 +3230,7 @@ g_type_name (GType type)
{ {
TypeNode *node; TypeNode *node;
g_return_val_if_uninitialized (static_quark_type_flags, g_type_init, NULL); g_return_val_if_type_system_uninitialized (NULL);
node = lookup_type_node_I (type); node = lookup_type_node_I (type);