[PATCH autoconf v3 07/12] ipconfig: Removed obsolete parameter from __connman_ipconfig_set_config()

[Jukka Rissanen]

---
 src/connman.h  |    2 +-
 src/ipconfig.c |   10 +++-------
 src/service.c  |    4 ++--
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/connman.h b/src/connman.h
index fb26999..b58f903 100644
--- a/src/connman.h
+++ b/src/connman.h
@@ -240,7 +240,7 @@ void __connman_ipconfig_append_ipv6(struct connman_ipconfig 
*ipconfig,
 void __connman_ipconfig_append_ipv6config(struct connman_ipconfig *ipconfig,
                                                        DBusMessageIter *iter);
 int __connman_ipconfig_set_config(struct connman_ipconfig *ipconfig,
-               enum connman_ipconfig_type type, DBusMessageIter *array);
+                                                       DBusMessageIter *array);
 void __connman_ipconfig_append_ethernet(struct connman_ipconfig *ipconfig,
                                                        DBusMessageIter *iter);
 enum connman_ipconfig_method __connman_ipconfig_get_method(
diff --git a/src/ipconfig.c b/src/ipconfig.c
index 2c0ede6..9781d52 100644
--- a/src/ipconfig.c
+++ b/src/ipconfig.c
@@ -1522,7 +1522,7 @@ void __connman_ipconfig_append_ipv4config(struct 
connman_ipconfig *ipconfig,
 }
 
 int __connman_ipconfig_set_config(struct connman_ipconfig *ipconfig,
-               enum connman_ipconfig_type type, DBusMessageIter *array)
+                                                       DBusMessageIter *array)
 {
        enum connman_ipconfig_method method = CONNMAN_IPCONFIG_METHOD_UNKNOWN;
        const char *address = NULL, *netmask = NULL, *gateway = NULL,
@@ -1530,11 +1530,7 @@ int __connman_ipconfig_set_config(struct 
connman_ipconfig *ipconfig,
        int prefix_length = 0;
        DBusMessageIter dict;
 
-       DBG("ipconfig %p type %d", ipconfig, type);
-
-       if (type != CONNMAN_IPCONFIG_TYPE_IPV4 &&
-                       type != CONNMAN_IPCONFIG_TYPE_IPV6)
-               return -EINVAL;
+       DBG("ipconfig %p", ipconfig);
 
        if (dbus_message_iter_get_arg_type(array) != DBUS_TYPE_ARRAY)
                return -EINVAL;
@@ -1610,7 +1606,7 @@ int __connman_ipconfig_set_config(struct connman_ipconfig 
*ipconfig,
 
                ipconfig->method = method;
 
-               if (type == CONNMAN_IPCONFIG_TYPE_IPV4)
+               if (ipconfig->type == CONNMAN_IPCONFIG_TYPE_IPV4)
                        connman_ipaddress_set_ipv4(ipconfig->address,
                                                address, netmask, gateway);
                else
diff --git a/src/service.c b/src/service.c
index 9338ca1..01e52f2 100644
--- a/src/service.c
+++ b/src/service.c
@@ -2061,11 +2061,11 @@ static DBusMessage *set_property(DBusConnection *conn,
                if (g_str_equal(name, "IPv4.Configuration") == TRUE) {
                        type = CONNMAN_IPCONFIG_TYPE_IPV4;
                        err = __connman_ipconfig_set_config(
-                                       service->ipconfig_ipv4, type, &value);
+                                       service->ipconfig_ipv4, &value);
                } else if (g_str_equal(name, "IPv6.Configuration") == TRUE) {
                        type = CONNMAN_IPCONFIG_TYPE_IPV6;
                        err = __connman_ipconfig_set_config(
-                                       service->ipconfig_ipv6, type, &value);
+                                       service->ipconfig_ipv6, &value);
                }
 
                if (err < 0) {
-- 
1.7.0.4

_______________________________________________
connman mailing list
connman@connman.net
http://lists.connman.net/listinfo/connman