From: Marcel Holtmann <marcel@holtmann.org>
Date: Sat, 19 Dec 2009 23:15:41 +0000 (-0800)
Subject: Rename D-Bus helper function for variable arrays
X-Git-Tag: 2.0_alpha~3010
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ee9f4754caf6e114542a8f1929d8fbd7d906bfe7;p=framework%2Fconnectivity%2Fconnman.git

Rename D-Bus helper function for variable arrays
---

diff --git a/include/dbus.h b/include/dbus.h
index fbbc973..28dc98b 100644
--- a/include/dbus.h
+++ b/include/dbus.h
@@ -53,11 +53,11 @@ void connman_dbus_property_append_basic(DBusMessageIter *iter,
 					const char *key, int type, void *val);
 void connman_dbus_property_append_dict(DBusMessageIter *iter, const char *key,
 			connman_dbus_append_cb_t function, void *user_data);
-void connman_dbus_property_append_fixed_array(DBusMessageIter *iter,
-				const char *key, int type, void *val, int len);
-void connman_dbus_property_append_variable_array(DBusMessageIter *iter,
+void connman_dbus_property_append_array(DBusMessageIter *iter,
 						const char *key, int type,
 			connman_dbus_append_cb_t function, void *user_data);
+void connman_dbus_property_append_fixed_array(DBusMessageIter *iter,
+				const char *key, int type, void *val, int len);
 
 dbus_bool_t connman_dbus_property_changed_basic(const char *path,
 				const char *interface, const char *key,
@@ -107,27 +107,27 @@ static inline void connman_dbus_dict_append_dict(DBusMessageIter *dict,
 	dbus_message_iter_close_container(dict, &entry);
 }
 
-static inline void connman_dbus_dict_append_fixed_array(DBusMessageIter *dict,
-				const char *key, int type, void *val, int len)
+static inline void connman_dbus_dict_append_array(DBusMessageIter *dict,
+		const char *key, int type, connman_dbus_append_cb_t function,
+							void *user_data)
 {
 	DBusMessageIter entry;
 
 	dbus_message_iter_open_container(dict, DBUS_TYPE_DICT_ENTRY,
 								NULL, &entry);
-	connman_dbus_property_append_fixed_array(&entry, key, type, val, len);
+	connman_dbus_property_append_array(&entry, key,
+						type, function, user_data);
 	dbus_message_iter_close_container(dict, &entry);
 }
 
-static inline void connman_dbus_dict_append_variable_array(DBusMessageIter *dict,
-		const char *key, int type, connman_dbus_append_cb_t function,
-							void *user_data)
+static inline void connman_dbus_dict_append_fixed_array(DBusMessageIter *dict,
+				const char *key, int type, void *val, int len)
 {
 	DBusMessageIter entry;
 
 	dbus_message_iter_open_container(dict, DBUS_TYPE_DICT_ENTRY,
 								NULL, &entry);
-	connman_dbus_property_append_variable_array(&entry, key,
-						type, function, user_data);
+	connman_dbus_property_append_fixed_array(&entry, key, type, val, len);
 	dbus_message_iter_close_container(dict, &entry);
 }
 
diff --git a/src/dbus.c b/src/dbus.c
index 884d78a..c4951d5 100644
--- a/src/dbus.c
+++ b/src/dbus.c
@@ -167,7 +167,7 @@ void connman_dbus_property_append_fixed_array(DBusMessageIter *iter,
 	dbus_message_iter_close_container(iter, &value);
 }
 
-void connman_dbus_property_append_variable_array(DBusMessageIter *iter,
+void connman_dbus_property_append_array(DBusMessageIter *iter,
 						const char *key, int type,
 			connman_dbus_append_cb_t function, void *user_data)
 {
@@ -262,8 +262,8 @@ dbus_bool_t connman_dbus_property_changed_array(const char *path,
 		return FALSE;
 
 	dbus_message_iter_init_append(signal, &iter);
-	connman_dbus_property_append_variable_array(&iter, key, type,
-							function, user_data);
+	connman_dbus_property_append_array(&iter, key, type,
+						function, user_data);
 
 	g_dbus_send_message(connection, signal);
 
diff --git a/src/device.c b/src/device.c
index fba934e..da8ee89 100644
--- a/src/device.c
+++ b/src/device.c
@@ -328,7 +328,7 @@ static DBusMessage *get_properties(DBusConnection *conn,
 			connman_dbus_dict_append_basic(&dict, "ScanInterval",
 				DBUS_TYPE_UINT16, &device->scan_interval);
 
-		connman_dbus_dict_append_variable_array(&dict, "Networks",
+		connman_dbus_dict_append_array(&dict, "Networks",
 				DBUS_TYPE_OBJECT_PATH, append_networks, device);
 		break;
 	}
diff --git a/src/manager.c b/src/manager.c
index 4d53aad..81663ea 100644
--- a/src/manager.c
+++ b/src/manager.c
@@ -54,14 +54,14 @@ static DBusMessage *get_properties(DBusConnection *conn,
 		connman_dbus_dict_append_basic(&dict, "ActiveProfile",
 						DBUS_TYPE_OBJECT_PATH, &str);
 
-	connman_dbus_dict_append_variable_array(&dict, "Profiles",
+	connman_dbus_dict_append_array(&dict, "Profiles",
 			DBUS_TYPE_OBJECT_PATH, __connman_profile_list, NULL);
-	connman_dbus_dict_append_variable_array(&dict, "Services",
+	connman_dbus_dict_append_array(&dict, "Services",
 			DBUS_TYPE_OBJECT_PATH, __connman_service_list, NULL);
-	connman_dbus_dict_append_variable_array(&dict, "Providers",
+	connman_dbus_dict_append_array(&dict, "Providers",
 			DBUS_TYPE_OBJECT_PATH, __connman_provider_list, NULL);
 
-	connman_dbus_dict_append_variable_array(&dict, "Devices",
+	connman_dbus_dict_append_array(&dict, "Devices",
 			DBUS_TYPE_OBJECT_PATH, __connman_device_list, NULL);
 
 	if (__connman_element_count(NULL, CONNMAN_ELEMENT_TYPE_CONNECTION) > 0)
@@ -76,11 +76,11 @@ static DBusMessage *get_properties(DBusConnection *conn,
 	connman_dbus_dict_append_basic(&dict, "OfflineMode",
 					DBUS_TYPE_BOOLEAN, &offlinemode);
 
-	connman_dbus_dict_append_variable_array(&dict, "AvailableTechnologies",
+	connman_dbus_dict_append_array(&dict, "AvailableTechnologies",
 		DBUS_TYPE_STRING, __connman_notifier_list_registered, NULL);
-	connman_dbus_dict_append_variable_array(&dict, "EnabledTechnologies",
+	connman_dbus_dict_append_array(&dict, "EnabledTechnologies",
 		DBUS_TYPE_STRING, __connman_notifier_list_enabled, NULL);
-	connman_dbus_dict_append_variable_array(&dict, "ConnectedTechnologies",
+	connman_dbus_dict_append_array(&dict, "ConnectedTechnologies",
 		DBUS_TYPE_STRING, __connman_notifier_list_connected, NULL);
 
 	str = __connman_service_default();
@@ -88,9 +88,9 @@ static DBusMessage *get_properties(DBusConnection *conn,
 		connman_dbus_dict_append_basic(&dict, "DefaultTechnology",
 						DBUS_TYPE_STRING, &str);
 
-	connman_dbus_dict_append_variable_array(&dict, "AvailableDebugs",
+	connman_dbus_dict_append_array(&dict, "AvailableDebugs",
 			DBUS_TYPE_STRING, __connman_debug_list_available, NULL);
-	connman_dbus_dict_append_variable_array(&dict, "EnabledDebugs",
+	connman_dbus_dict_append_array(&dict, "EnabledDebugs",
 			DBUS_TYPE_STRING, __connman_debug_list_enabled, NULL);
 
 	connman_dbus_dict_close(&array, &dict);
diff --git a/src/profile.c b/src/profile.c
index 4355704..1fd1e6a 100644
--- a/src/profile.c
+++ b/src/profile.c
@@ -238,7 +238,7 @@ static DBusMessage *get_properties(DBusConnection *conn,
 	connman_dbus_dict_append_basic(&dict, "OfflineMode",
 				DBUS_TYPE_BOOLEAN, &profile->offlinemode);
 
-	connman_dbus_dict_append_variable_array(&dict, "Services",
+	connman_dbus_dict_append_array(&dict, "Services",
 			DBUS_TYPE_OBJECT_PATH, __connman_service_list, NULL);
 
 	connman_dbus_dict_close(&array, &dict);