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

fetch the nth iface entry of the type node in the nth loop iteration, not

Browse Source 
Sat Jun 10 08:38:27 2000  Tim Janik  <timj@gtk.org>

        * gtype.c (type_class_init): fetch the nth iface entry of the
        type node in the nth loop iteration, not alwys the first.
        bug discovered by Walt Pohl <cher@suitware.com>.
        (type_data_finalize_class_ifaces): same here, cut and paste
        rulez.
This commit is contained in:
Tim Janik 2000-06-10 06:41:55 +00:00 committed by Tim Janik
parent ac0c2c1c5a
commit 5ff84de0df
2 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gobject/ChangeLog
View File

@ -1,3 +1,11 @@
Sat Jun 10 08:38:27 2000 Tim Janik <timj@gtk.org>
* gtype.c (type_class_init): fetch the nth iface entry of the
type node in the nth loop iteration, not alwys the first.
bug discovered by Walt Pohl <cher@suitware.com>.
(type_data_finalize_class_ifaces): same here, cut and paste
rulez.
Wed Jun 7 09:21:05 2000 Owen Taylor <otaylor@redhat.com> Wed Jun 7 09:21:05 2000 Owen Taylor <otaylor@redhat.com>
* Makefile.am (INCLUDES): Add top_builddir so glibconfig.h * Makefile.am (INCLUDES): Add top_builddir so glibconfig.h

20
gobject/gtype.c
View File

@ -1014,14 +1014,14 @@ type_class_init (TypeNode *node,
/* ok, we got the class done, now initialize all interfaces */ /* ok, we got the class done, now initialize all interfaces */
for (entry = NULL, i = 0; i < node->n_ifaces; i++) for (entry = NULL, i = 0; i < node->n_ifaces; i++)
if (!node->private.iface_entries[i].vtable) if (!node->private.iface_entries[i].vtable)
entry = node->private.iface_entries; entry = node->private.iface_entries + i;
while (entry) while (entry)
{ {
type_iface_vtable_init (LOOKUP_TYPE_NODE (entry->iface_type), node); type_iface_vtable_init (LOOKUP_TYPE_NODE (entry->iface_type), node);
for (entry = NULL, i = 0; i < node->n_ifaces; i++) for (entry = NULL, i = 0; i < node->n_ifaces; i++)
if (!node->private.iface_entries[i].vtable) if (!node->private.iface_entries[i].vtable)
entry = node->private.iface_entries; entry = node->private.iface_entries + i;
} }
} }
@ -1036,19 +1036,19 @@ type_data_finalize_class_ifaces (TypeNode *node)
g_message ("finalizing interfaces for %sClass `%s'", g_message ("finalizing interfaces for %sClass `%s'",
type_descriptive_name (G_TYPE_FUNDAMENTAL (NODE_TYPE (node))), type_descriptive_name (G_TYPE_FUNDAMENTAL (NODE_TYPE (node))),
type_descriptive_name (NODE_TYPE (node))); type_descriptive_name (NODE_TYPE (node)));
for (entry = NULL, i = 0; i < node->n_ifaces; i++) for (entry = NULL, i = 0; i < node->n_ifaces; i++)
if (node->private.iface_entries[i].vtable && if (node->private.iface_entries[i].vtable &&
node->private.iface_entries[i].vtable->g_instance_type == NODE_TYPE (node)) node->private.iface_entries[i].vtable->g_instance_type == NODE_TYPE (node))
entry = node->private.iface_entries; entry = node->private.iface_entries + i;
while (entry) while (entry)
{ {
type_iface_vtable_finalize (LOOKUP_TYPE_NODE (entry->iface_type), node, entry->vtable); type_iface_vtable_finalize (LOOKUP_TYPE_NODE (entry->iface_type), node, entry->vtable);
for (entry = NULL, i = 0; i < node->n_ifaces; i++) for (entry = NULL, i = 0; i < node->n_ifaces; i++)
if (node->private.iface_entries[i].vtable && if (node->private.iface_entries[i].vtable &&
node->private.iface_entries[i].vtable->g_instance_type == NODE_TYPE (node)) node->private.iface_entries[i].vtable->g_instance_type == NODE_TYPE (node))
entry = node->private.iface_entries; entry = node->private.iface_entries + i;
} }
} }