Add user data to D-Bus helper function callbacks

9 files changed, 23 insertions, 26 deletions

diff --git a/include/dbus.h b/include/dbus.h
index ab6cc07c..3122dfcf 100644
--- a/include/dbus.h
+++ b/include/dbus.h
@@ -44,7 +44,8 @@ extern "C" {
 #define CONNMAN_NETWORK_INTERFACE	CONNMAN_SERVICE ".Network"
 #define CONNMAN_PROVIDER_INTERFACE	CONNMAN_SERVICE ".Provider"
 
-typedef void (* connman_dbus_append_cb_t) (DBusMessageIter *iter);
+typedef void (* connman_dbus_append_cb_t) (DBusMessageIter *iter,
+							void *user_data);
 
 DBusConnection *connman_dbus_get_connection(void);
 
diff --git a/src/connman.h b/src/connman.h
index 6f9debc2..a391236c 100644
--- a/src/connman.h
+++ b/src/connman.h
@@ -78,8 +78,8 @@ int __connman_agent_request_passphrase(struct connman_service *service,
 int __connman_log_init(const char *debug, connman_bool_t detach);
 void __connman_log_cleanup(void);
 
-void __connman_debug_list_available(DBusMessageIter *iter);
-void __connman_debug_list_enabled(DBusMessageIter *iter);
+void __connman_debug_list_available(DBusMessageIter *iter, void *user_data);
+void __connman_debug_list_enabled(DBusMessageIter *iter, void *user_data);
 
 #include <connman/option.h>
 
@@ -268,7 +268,7 @@ void __connman_udev_enable_rfkill_processing(void);
 int __connman_device_init(void);
 void __connman_device_cleanup(void);
 
-void __connman_device_list(DBusMessageIter *iter);
+void __connman_device_list(DBusMessageIter *iter, void *user_data);
 
 enum connman_service_type __connman_device_get_service_type(struct connman_device *device);
 
@@ -335,7 +335,7 @@ connman_bool_t __connman_profile_get_offlinemode(void);
 int __connman_profile_set_offlinemode(connman_bool_t offlinemode);
 int __connman_profile_save_default(void);
 
-void __connman_profile_list(DBusMessageIter *iter);
+void __connman_profile_list(DBusMessageIter *iter, void *user_data);
 const char *__connman_profile_active_ident(void);
 const char *__connman_profile_active_path(void);
 
@@ -356,7 +356,7 @@ int __connman_profile_remove_network(struct connman_network *network);
 int __connman_service_init(void);
 void __connman_service_cleanup(void);
 
-void __connman_service_list(DBusMessageIter *iter);
+void __connman_service_list(DBusMessageIter *iter, void *user_data);
 const char *__connman_service_default(void);
 
 void __connman_service_put(struct connman_service *service);
@@ -384,7 +384,7 @@ const char *__connman_service_type2string(enum connman_service_type type);
 
 #include <connman/provider.h>
 
-void __connman_provider_list(DBusMessageIter *iter);
+void __connman_provider_list(DBusMessageIter *iter, void *user_data);
 int __connman_provider_create_and_connect(DBusMessage *msg);
 int __connman_provider_indicate_state(struct connman_provider *provider,
 				     enum connman_provider_state state);
@@ -399,9 +399,9 @@ int __connman_provider_init(void);
 int __connman_notifier_init(void);
 void __connman_notifier_cleanup(void);
 
-void __connman_notifier_list_registered(DBusMessageIter *iter);
-void __connman_notifier_list_enabled(DBusMessageIter *iter);
-void __connman_notifier_list_connected(DBusMessageIter *iter);
+void __connman_notifier_list_registered(DBusMessageIter *iter, void *user_data);
+void __connman_notifier_list_enabled(DBusMessageIter *iter, void *user_data);
+void __connman_notifier_list_connected(DBusMessageIter *iter, void *user_data);
 
 void __connman_notifier_register(enum connman_service_type type);
 void __connman_notifier_unregister(enum connman_service_type type);
diff --git a/src/dbus.c b/src/dbus.c
index b2fb27b1..e9c38f8e 100644
--- a/src/dbus.c
+++ b/src/dbus.c
@@ -133,7 +133,7 @@ void connman_dbus_property_append_dict(DBusMessageIter *iter, const char *key,
 
 	connman_dbus_dict_open(&value, &dict);
 	if (function)
-		function(&dict);
+		function(&dict, user_data);
 	connman_dbus_dict_close(&value, &dict);
 
 	dbus_message_iter_close_container(iter, &value);
@@ -194,7 +194,7 @@ void connman_dbus_property_append_variable_array(DBusMessageIter *iter,
 	dbus_message_iter_open_container(&value, DBUS_TYPE_ARRAY,
 							array_sig, &array);
 	if (function)
-		function(&array);
+		function(&array, NULL);
 	dbus_message_iter_close_container(&value, &array);
 
 	dbus_message_iter_close_container(iter, &value);
diff --git a/src/device.c b/src/device.c
index 8c0417dc..05e27ab2 100644
--- a/src/device.c
+++ b/src/device.c
@@ -252,7 +252,7 @@ static int set_powered(struct connman_device *device, connman_bool_t powered)
 	return err;
 }
 
-void __connman_device_list(DBusMessageIter *iter)
+void __connman_device_list(DBusMessageIter *iter, void *user_data)
 {
 	__connman_element_list(NULL, CONNMAN_ELEMENT_TYPE_DEVICE, iter);
 }
diff --git a/src/log.c b/src/log.c
index 5b5f82ca..5298652b 100644
--- a/src/log.c
+++ b/src/log.c
@@ -103,7 +103,7 @@ void connman_debug(const char *format, ...)
 extern struct connman_debug_desc __start___debug[];
 extern struct connman_debug_desc __stop___debug[];
 
-void __connman_debug_list_available(DBusMessageIter *iter)
+void __connman_debug_list_available(DBusMessageIter *iter, void *user_data)
 {
 	struct connman_debug_desc *desc;
 
@@ -117,7 +117,7 @@ void __connman_debug_list_available(DBusMessageIter *iter)
 
 static gchar **enabled = NULL;
 
-void __connman_debug_list_enabled(DBusMessageIter *iter)
+void __connman_debug_list_enabled(DBusMessageIter *iter, void *user_data)
 {
 	int i;
 
diff --git a/src/notifier.c b/src/notifier.c
index 9b6fbcf9..2f682f72 100644
--- a/src/notifier.c
+++ b/src/notifier.c
@@ -76,7 +76,7 @@ static volatile gint registered[MAX_TECHNOLOGIES];
 static volatile gint enabled[MAX_TECHNOLOGIES];
 static volatile gint connected[MAX_TECHNOLOGIES];
 
-void __connman_notifier_list_registered(DBusMessageIter *iter)
+void __connman_notifier_list_registered(DBusMessageIter *iter, void *user_data)
 {
 	int i;
 
@@ -92,7 +92,7 @@ void __connman_notifier_list_registered(DBusMessageIter *iter)
 	}
 }
 
-void __connman_notifier_list_enabled(DBusMessageIter *iter)
+void __connman_notifier_list_enabled(DBusMessageIter *iter, void *user_data)
 {
 	int i;
 
@@ -108,7 +108,7 @@ void __connman_notifier_list_enabled(DBusMessageIter *iter)
 	}
 }
 
-void __connman_notifier_list_connected(DBusMessageIter *iter)
+void __connman_notifier_list_connected(DBusMessageIter *iter, void *user_data)
 {
 	int i;
 
diff --git a/src/profile.c b/src/profile.c
index 9e2c0c13..66597b4b 100644
--- a/src/profile.c
+++ b/src/profile.c
@@ -53,10 +53,8 @@ static void append_path(gpointer key, gpointer value, gpointer user_data)
 							&profile->path);
 }
 
-void __connman_profile_list(DBusMessageIter *iter)
+void __connman_profile_list(DBusMessageIter *iter, void *user_data)
 {
-	DBG("");
-
 	g_hash_table_foreach(profile_hash, append_path, iter);
 }
 
diff --git a/src/provider.c b/src/provider.c
index 28acad8d..ec3cf3b2 100644
--- a/src/provider.c
+++ b/src/provider.c
@@ -95,7 +95,7 @@ static void append_path(gpointer key, gpointer value, gpointer user_data)
 					&provider->path);
 }
 
-void __connman_provider_list(DBusMessageIter *iter)
+void __connman_provider_list(DBusMessageIter *iter, void *user_data)
 {
 	g_hash_table_foreach(provider_hash, append_path, iter);
 }
diff --git a/src/service.c b/src/service.c
index d29303ce..3b760b23 100644
--- a/src/service.c
+++ b/src/service.c
@@ -80,10 +80,8 @@ static void append_path(gpointer value, gpointer user_data)
 							&service->path);
 }
 
-void __connman_service_list(DBusMessageIter *iter)
+void __connman_service_list(DBusMessageIter *iter, void *user_data)
 {
-	DBG("");
-
 	g_sequence_foreach(service_list, append_path, iter);
 }
 
@@ -385,7 +383,7 @@ static void apn_changed(struct connman_service *service)
 						DBUS_TYPE_BOOLEAN, &required);
 }
 
-static void append_settings(DBusMessageIter *iter)
+static void append_settings(DBusMessageIter *iter, void *user_data)
 {
 	const char *str = "dhcp";