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

Bug 571373 - Remove hardcoded offsets in ginfo.c

Browse Source 
In a few places we had hardcoded sizes for accessing structure members
and computing into variable size arrays.  Remove those.
This commit is contained in:
Colin Walters 2009-02-11 23:51:28 -05:00
parent 83c0d9b93b
commit b4d4ca5d38
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ginfo.c
View File

@ -775,7 +775,7 @@ g_arg_info_get_type (GIArgInfo *info)
{ {
GIBaseInfo *base = (GIBaseInfo *)info; GIBaseInfo *base = (GIBaseInfo *)info;
return g_type_info_new (base, base->typelib, base->offset + 12); return g_type_info_new (base, base->typelib, base->offset + G_STRUCT_OFFSET (ArgBlob, arg_type));
} }
/* GITypeInfo functions */ /* GITypeInfo functions */
@ -828,7 +828,9 @@ g_type_info_get_param_type (GITypeInfo *info,
case GI_TYPE_TAG_GLIST: case GI_TYPE_TAG_GLIST:
case GI_TYPE_TAG_GSLIST: case GI_TYPE_TAG_GSLIST:
case GI_TYPE_TAG_GHASH: case GI_TYPE_TAG_GHASH:
return g_type_info_new (base, base->typelib, base->offset + 4 + 4 * n); return g_type_info_new (base, base->typelib,
base->offset + sizeof (ParamTypeBlob)
+ sizeof (SimpleTypeBlob) * n);
break; break;
default: ; default: ;
@ -1024,7 +1026,7 @@ g_field_info_get_type (GIFieldInfo *info)
{ {
GIBaseInfo *base = (GIBaseInfo *)info; GIBaseInfo *base = (GIBaseInfo *)info;
return g_type_info_new (base, base->typelib, base->offset + 8); return g_type_info_new (base, base->typelib, base->offset + G_STRUCT_OFFSET (FieldBlob, type));
} }
/* GIRegisteredTypeInfo functions */ /* GIRegisteredTypeInfo functions */
@ -1722,7 +1724,7 @@ g_property_info_get_type (GIPropertyInfo *info)
{ {
GIBaseInfo *base = (GIBaseInfo *)info; GIBaseInfo *base = (GIBaseInfo *)info;
return g_type_info_new (base, base->typelib, base->offset + 8); return g_type_info_new (base, base->typelib, base->offset + G_STRUCT_OFFSET (PropertyBlob, type));
} }