diff options
| author | Colin Walters <walters@src.gnome.org> | 2008-11-18 18:42:36 +0000 |
|---|---|---|
| committer | Colin Walters <walters@src.gnome.org> | 2008-11-18 18:42:36 +0000 |
| commit | a536b3f6ae67fbc347ea3dcd0190f033a43006f9 (patch) | |
| tree | 205273aa77cc6032c1abdd528a20593b1d2427ab | |
| parent | eef46134c0c931c665d2e88781bd95784ee10843 (diff) | |
| download | gobject-introspection-a536b3f6ae67fbc347ea3dcd0190f033a43006f9.tar.gz | |
Use sizeof() instead of hard-coding struct sizes
svn path=/trunk/; revision=946
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | girepository/girnode.c | 16 |
2 files changed, 13 insertions, 8 deletions
@@ -1,3 +1,8 @@ +2008-11-18 Andreas Rottmann <a.rottmann@gmx.at> + + * girepository/girnode.c (g_ir_node_build_typelib): Use sizeof() + instead of hard-coding struct sizes. + 2008-11-18 Owen Taylor <otaylor@redhat.com> Bug 561296 - Add "storage type" to the typelib data for enums diff --git a/girepository/girnode.c b/girepository/girnode.c index 8e9d5d1a..75dd265c 100644 --- a/girepository/girnode.c +++ b/girepository/girnode.c @@ -1576,8 +1576,8 @@ g_ir_node_build_typelib (GIrNode *node, signature = *offset2; n = g_list_length (function->parameters); - *offset += 16; - *offset2 += 8 + n * 12; + *offset += sizeof(FunctionBlob); + *offset2 += sizeof(SignatureBlob) + n * sizeof(ArgBlob); blob->blob_type = BLOB_TYPE_FUNCTION; blob->deprecated = function->deprecated; @@ -1628,8 +1628,8 @@ g_ir_node_build_typelib (GIrNode *node, signature = *offset2; n = g_list_length (function->parameters); - *offset += 12; - *offset2 += 8 + n * 12; + *offset += sizeof(CallbackBlob); + *offset2 += sizeof(SignatureBlob) + n * sizeof(ArgBlob); blob->blob_type = BLOB_TYPE_CALLBACK; blob->deprecated = function->deprecated; @@ -1671,8 +1671,8 @@ g_ir_node_build_typelib (GIrNode *node, signature = *offset2; n = g_list_length (signal->parameters); - *offset += 12; - *offset2 += 8 + n * 12; + *offset += sizeof(SignalBlob); + *offset2 += sizeof(SignatureBlob) + n * sizeof(ArgBlob); blob->deprecated = signal->deprecated; blob->run_first = signal->run_first; @@ -1722,8 +1722,8 @@ g_ir_node_build_typelib (GIrNode *node, signature = *offset2; n = g_list_length (vfunc->parameters); - *offset += 16; - *offset2 += 8 + n * 12; + *offset += sizeof(VFuncBlob); + *offset2 += sizeof(SignatureBlob) + n * sizeof(ArgBlob); blob->name = write_string (node->name, strings, data, offset2); blob->must_chain_up = 0; /* FIXME */ |