luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-09-20 01:06:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Change GType print placeholders to G_GUINTPTR_FORMAT

Browse Source 
GType is not guaranteed to be the same as gsize, but it is representable
as guintptr.
This commit is contained in:
Alex Richardson 2022-12-14 23:55:17 +00:00 committed by Philip Withnall
parent d0e03f0930
commit a121b1bf71
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gobject/gsignal.c
View File

@ -1233,8 +1233,8 @@ g_signal_lookup (const gchar *name,
{ {
/* give elaborate warnings */ /* give elaborate warnings */
if (!g_type_name (itype)) if (!g_type_name (itype))
g_critical (G_STRLOC ": unable to look up signal \"%s\" for invalid type id '%"G_GSIZE_FORMAT"'", g_critical (G_STRLOC ": unable to look up signal \"%s\" for invalid type id '%"G_GUINTPTR_FORMAT"'",
name, itype); name, (guintptr) itype);
else if (!g_signal_is_valid_name (name)) else if (!g_signal_is_valid_name (name))
g_critical (G_STRLOC ": unable to look up invalid signal name \"%s\" on type '%s'", g_critical (G_STRLOC ": unable to look up invalid signal name \"%s\" on type '%s'",
name, g_type_name (itype)); name, g_type_name (itype));
@ -1282,8 +1282,8 @@ g_signal_list_ids (GType itype,
{ {
/* give elaborate warnings */ /* give elaborate warnings */
if (!g_type_name (itype)) if (!g_type_name (itype))
g_critical (G_STRLOC ": unable to list signals for invalid type id '%"G_GSIZE_FORMAT"'", g_critical (G_STRLOC ": unable to list signals for invalid type id '%"G_GUINTPTR_FORMAT"'",
itype); (guintptr) itype);
else if (!G_TYPE_IS_INSTANTIATABLE (itype) && !G_TYPE_IS_INTERFACE (itype)) else if (!G_TYPE_IS_INSTANTIATABLE (itype) && !G_TYPE_IS_INTERFACE (itype))
g_critical (G_STRLOC ": unable to list signals of non instantiatable type '%s'", g_critical (G_STRLOC ": unable to list signals of non instantiatable type '%s'",
g_type_name (itype)); g_type_name (itype));
@ -2034,8 +2034,8 @@ g_signal_override_class_handler (const gchar *signal_name,
g_signal_override_class_closure (signal_id, instance_type, g_signal_override_class_closure (signal_id, instance_type,
g_cclosure_new (class_handler, NULL, NULL)); g_cclosure_new (class_handler, NULL, NULL));
else else
g_critical ("%s: signal name '%s' is invalid for type id '%"G_GSIZE_FORMAT"'", g_critical ("%s: signal name '%s' is invalid for type id '%"G_GUINTPTR_FORMAT"'",
G_STRLOC, signal_name, instance_type); G_STRLOC, signal_name, (guintptr) instance_type);
} }

6
gobject/gtype.c
View File

@ -2721,9 +2721,9 @@ g_type_register_fundamental (GType type_id,
if ((type_id & TYPE_ID_MASK) || if ((type_id & TYPE_ID_MASK) ||
type_id > G_TYPE_FUNDAMENTAL_MAX) type_id > G_TYPE_FUNDAMENTAL_MAX)
{ {
g_critical ("attempt to register fundamental type '%s' with invalid type id (%" G_GSIZE_FORMAT ")", g_critical ("attempt to register fundamental type '%s' with invalid type id (%" G_GUINTPTR_FORMAT ")",
type_name, type_name,
type_id); (guintptr) type_id);
return 0; return 0;
} }
if ((finfo->type_flags & G_TYPE_FLAG_INSTANTIATABLE) && if ((finfo->type_flags & G_TYPE_FLAG_INSTANTIATABLE) &&
@ -4390,7 +4390,7 @@ g_type_value_table_peek (GType type)
return vtable; return vtable;
if (!node) if (!node)
g_critical (G_STRLOC ": type id '%" G_GSIZE_FORMAT "' is invalid", type); g_critical (G_STRLOC ": type id '%" G_GUINTPTR_FORMAT "' is invalid", (guintptr) type);
if (!has_refed_data) if (!has_refed_data)
g_critical ("can't peek value table for type '%s' which is not currently referenced", g_critical ("can't peek value table for type '%s' which is not currently referenced",
type_descriptive_name_I (type)); type_descriptive_name_I (type));