diff options
author | Søren Sandmann Pedersen <sandmann@daimi.au.dk> | 2009-04-19 15:11:04 -0400 |
---|---|---|
committer | Søren Sandmann Pedersen <sandmann@daimi.au.dk> | 2009-04-19 15:11:04 -0400 |
commit | c5903dd2f53f3ed87091a499009bb2c284a7db7f (patch) | |
tree | 64383b265d4257783cd837dbc5e74bbee71e1d10 | |
parent | fd2997f92d1f40e0f519c1b8ed5a7efe665e2366 (diff) |
Use correct type for the parameter array
-rw-r--r-- | dbus.c | 16 |
1 files changed, 8 insertions, 8 deletions
@@ -58,7 +58,7 @@ struct nul_dbus_member_t nul_dbus_function_t function; - nul_ptr_t * parameters; + nul_dbus_parameter_t ** parameters; int n_inputs; int n_outputs; @@ -375,14 +375,14 @@ introspect (nul_dbus_object_t *object) for (q = interface->members; *q; ++q) { nul_dbus_member_t *member = *q; - nul_ptr_t *r; + int i; xml = nul_string_append_printf ( xml, " <method name=\"%s\">\n", member->name); - for (r = member->parameters; *r; ++r) + for (i = 0; member->parameters[i] != NULL; ++i) { - nul_dbus_parameter_t *parameter = *r; + nul_dbus_parameter_t *parameter = member->parameters[i]; xml = nul_string_append_printf ( xml, @@ -1037,7 +1037,7 @@ static nul_fun_def_t * make_reply_fun (nul_dbus_member_t *member) { nul_type_t *types; - nul_ptr_t *p; + nul_dbus_parameter_t **p; int n; types = idle_free (g_new0 (nul_type_t, @@ -1069,13 +1069,13 @@ nul_dbus_method (const char *name, { nul_dbus_member_t *member = g_new0 (nul_dbus_member_t, 1); va_list parameters; - nul_ptr_t *p; + nul_dbus_parameter_t **p; member->name = g_strdup (name); member->function = function; va_start (parameters, parameter1); - member->parameters = make_ptr_array ((nul_dbus_type_t *)parameter1, parameters); + member->parameters = (nul_dbus_parameter_t **)make_ptr_array (parameter1, parameters); va_end (parameters); member->n_inputs = 0; @@ -1309,7 +1309,7 @@ nul_dbus_invoke (nul_dbus_service_t *service, va_list args; InvokeInfo *info; DBusPendingCall *pending; - nul_ptr_t *p; + nul_dbus_parameter_t **p; g_return_if_fail (service != NULL); |