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

Use GI_TYPE_TAG_IS_BASIC

Browse Source 
Now that we have it.
This commit is contained in:
Emmanuele Bassi 2022-02-13 14:35:53 +00:00
parent 13f09c5594
commit f4a7efaa2e
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
girnode.c
View File

@ -632,7 +632,7 @@ _g_ir_node_get_full_size_internal (GIrNode *parent,
{ {
GIrNodeType *type = (GIrNodeType *)node; GIrNodeType *type = (GIrNodeType *)node;
size = sizeof (SimpleTypeBlob); size = sizeof (SimpleTypeBlob);
if (!G_TYPE_TAG_IS_BASIC(type->tag)) if (!GI_TYPE_TAG_IS_BASIC (type->tag))
{ {
g_debug ("node %p type tag '%s'", node, g_debug ("node %p type tag '%s'", node,
g_type_tag_to_string (type->tag)); g_type_tag_to_string (type->tag));
@ -1208,7 +1208,7 @@ serialize_type (GIrTypelibBuild *build,
{ {
gint i; gint i;
if (G_TYPE_TAG_IS_BASIC(node->tag)) if (GI_TYPE_TAG_IS_BASIC (node->tag))
{ {
g_string_append_printf (str, "%s%s", g_type_tag_to_string (node->tag), g_string_append_printf (str, "%s%s", g_type_tag_to_string (node->tag),
node->is_pointer ? "*" : ""); node->is_pointer ? "*" : "");
@ -1430,7 +1430,7 @@ _g_ir_node_build_typelib (GIrNode *node,
*offset += sizeof (SimpleTypeBlob); *offset += sizeof (SimpleTypeBlob);
if (G_TYPE_TAG_IS_BASIC (type->tag)) if (GI_TYPE_TAG_IS_BASIC (type->tag))
{ {
blob->flags.reserved = 0; blob->flags.reserved = 0;
blob->flags.reserved2 = 0; blob->flags.reserved2 = 0;

2
girwriter.c
View File

@ -231,7 +231,7 @@ write_type_info (const gchar *namespace,
xml_end_element (file, "type"); xml_end_element (file, "type");
} }
else if (G_TYPE_TAG_IS_BASIC (tag)) else if (GI_TYPE_TAG_IS_BASIC (tag))
{ {
xml_start_element (file, "type"); xml_start_element (file, "type");
xml_printf (file, " name=\"%s\"", g_type_tag_to_string (tag)); xml_printf (file, " name=\"%s\"", g_type_tag_to_string (tag));

2
gitypelib.c
View File

@ -792,7 +792,7 @@ validate_type_blob (GITypelib *typelib,
if (simple->flags.reserved == 0 && if (simple->flags.reserved == 0 &&
simple->flags.reserved2 == 0) simple->flags.reserved2 == 0)
{ {
if (!G_TYPE_TAG_IS_BASIC(simple->flags.tag)) if (!GI_TYPE_TAG_IS_BASIC(simple->flags.tag))
{ {
g_set_error (error, g_set_error (error,
G_TYPELIB_ERROR, G_TYPELIB_ERROR,

2
gitypes.h
View File

@ -405,7 +405,7 @@ typedef enum {
GI_TYPE_TAG_GTYPE = 12, GI_TYPE_TAG_GTYPE = 12,
GI_TYPE_TAG_UTF8 = 13, GI_TYPE_TAG_UTF8 = 13,
GI_TYPE_TAG_FILENAME = 14, GI_TYPE_TAG_FILENAME = 14,
/* Non-basic types; compare with G_TYPE_TAG_IS_BASIC */ /* Non-basic types; compare with GI_TYPE_TAG_IS_BASIC */
GI_TYPE_TAG_ARRAY = 15, /* container (see GI_TYPE_TAG_IS_CONTAINER) */ GI_TYPE_TAG_ARRAY = 15, /* container (see GI_TYPE_TAG_IS_CONTAINER) */
GI_TYPE_TAG_INTERFACE = 16, GI_TYPE_TAG_INTERFACE = 16,
GI_TYPE_TAG_GLIST = 17, /* container */ GI_TYPE_TAG_GLIST = 17, /* container */