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

Redo signature_offset to be cleaner and correct for vfuncs

Browse Source 
svn path=/trunk/; revision=475
This commit is contained in:
Colin Walters 2008-08-23 21:30:01 +00:00
parent 4c2a09226b
commit 5daf51a580
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ginfo.c
View File

@ -515,16 +515,24 @@ g_function_info_get_vfunc (GIFunctionInfo *info)
static guint32 static guint32
signature_offset (GICallableInfo *info) signature_offset (GICallableInfo *info)
{ {
int sigoff = -1;
switch (info->base.type) switch (info->base.type)
{ {
case GI_INFO_TYPE_FUNCTION: case GI_INFO_TYPE_FUNCTION:
sigoff = G_STRUCT_OFFSET (FunctionBlob, signature);
break;
case GI_INFO_TYPE_VFUNC: case GI_INFO_TYPE_VFUNC:
return *(guint32 *)&info->base.typelib->data[info->base.offset + 12]; sigoff = G_STRUCT_OFFSET (VFuncBlob, signature);
break;
case GI_INFO_TYPE_CALLBACK: case GI_INFO_TYPE_CALLBACK:
sigoff = G_STRUCT_OFFSET (CallbackBlob, signature);
break;
case GI_INFO_TYPE_SIGNAL: case GI_INFO_TYPE_SIGNAL:
return *(guint32 *)&info->base.typelib->data[info->base.offset + 8]; sigoff = G_STRUCT_OFFSET (SignalBlob, signature);
break;
} }
if (sigoff >= 0)
return *(guint32 *)&info->base.typelib->data[info->base.offset + sigoff];
return 0; return 0;
} }