Use correct type for the member array

1 files changed, 14 insertions, 18 deletions

diff --git a/dbus.c b/dbus.c
index 0669cbe..32f63f6 100644
--- a/dbus.c
+++ b/dbus.c
@@ -44,7 +44,7 @@ struct nul_dbus_object_t
 struct nul_dbus_interface_t
 {
     char *name;
-    nul_ptr_t *members;
+    nul_dbus_member_t **members;
 };
 
 struct nul_dbus_member_t
@@ -367,14 +367,14 @@ introspect (nul_dbus_object_t *object)
     for (itf = object->interfaces; *itf; ++itf)
     {
 	nul_dbus_interface_t *interface = *itf;
-	nul_ptr_t *q;
+	nul_dbus_member_t **mem;
         
 	xml = nul_string_append_printf (
 	    xml, "  <interface name=\"%s\">\n", interface->name);
         
-	for (q = interface->members; *q; ++q)
+	for (mem = interface->members; *mem; ++mem)
 	{
-	    nul_dbus_member_t *member = *q;
+	    nul_dbus_member_t *member = *mem;
             int i;
             
 	    xml = nul_string_append_printf (
@@ -661,11 +661,11 @@ message_function (DBusConnection *connection,
         
 	if (strcmp (msg_interface, interface->name) == 0)
 	{
-	    nul_ptr_t *q;
+            nul_dbus_member_t **mem;
             
-	    for (q = interface->members; *q; ++q)
+	    for (mem = interface->members; *mem; ++mem)
 	    {
-		nul_dbus_member_t *member = *q;
+		nul_dbus_member_t *member = *mem;
                 
 		if (strcmp (member->name, msg_member) == 0)
 		    return invoke (connection, object, member, message);
@@ -963,20 +963,16 @@ nul_dbus_interface (const char *name,
 {
     nul_dbus_interface_t *interface = g_new0 (nul_dbus_interface_t, 1);
     va_list parameters;
-    nul_ptr_t *p;
+    nul_dbus_member_t **mem;
     
     interface->name = g_strdup (name);
     
     va_start (parameters, member1);
-    interface->members = make_ptr_array (member1, parameters);
+    interface->members = (nul_dbus_member_t **)make_ptr_array (member1, parameters);
     va_end (parameters);
     
-    for (p = interface->members; *p; ++p)
-    {
-	nul_dbus_member_t *member = *p;
-        
-	member->interface = interface;
-    }
+    for (mem = interface->members; *mem; ++mem)
+	(* mem)->interface = interface;
     
     return interface;
 }
@@ -1279,11 +1275,11 @@ find_interface (nul_dbus_object_t *object, const char *name)
 static nul_dbus_member_t *
 find_member (nul_dbus_interface_t *interface, const char *name)
 {
-    nul_ptr_t *p;
+    nul_dbus_member_t **mem;
     
-    for (p = interface->members; *p; ++p)
+    for (mem = interface->members; *mem; ++mem)
     {
-	nul_dbus_member_t *member = *p;
+	nul_dbus_member_t *member = *mem;
         
 	if (strcmp (member->name, name) == 0)
 	    return member;