[RFC v3 08/13] network: Use setter/getters for connman_network_set/get_uint16()

[Daniel Wagner]

From: Daniel Wagner <daniel.wag...@bmw-carit.de>

---
 include/network.h |    8 +++---
 src/network.c     |   59 +++++++++++++++++++++-------------------------------
 2 files changed, 28 insertions(+), 39 deletions(-)

diff --git a/include/network.h b/include/network.h
index 0f42b4f..7a026c2 100644
--- a/include/network.h
+++ b/include/network.h
@@ -124,6 +124,8 @@ int connman_network_set_wifi_wps(struct connman_network 
*network, connman_bool_t
 int connman_network_set_wifi_use_wps(struct connman_network *network, 
connman_bool_t use_wps);
 int connman_network_set_roaming(struct connman_network *network, 
connman_bool_t roaming);
 int connman_network_set_strength(struct connman_network *network, 
connman_uint8_t strength);
+int connman_network_set_frequency(struct connman_network *network, 
connman_uint16_t frequency);
+int connman_network_set_wifi_channel(struct connman_network *network, 
connman_uint16_t channel);
 
 const char *connman_network_get_path(struct connman_network *network);
 const char *connman_network_get_name(struct connman_network *network);
@@ -143,11 +145,9 @@ connman_bool_t connman_network_get_roaming(struct 
connman_network *network);
 connman_bool_t connman_network_get_wifi_wps(struct connman_network *network);
 connman_bool_t connman_network_get_wifi_use_wps(struct connman_network 
*network);
 connman_uint8_t connman_network_get_strength(struct connman_network *network);
+connman_uint16_t connman_network_get_frequency(struct connman_network 
*network);
+connman_uint16_t connman_network_get_wifi_channel(struct connman_network 
*network);
 
-int connman_network_set_uint16(struct connman_network *network,
-                                       const char *key, connman_uint16_t 
value);
-connman_uint16_t connman_network_get_uint16(struct connman_network *network,
-                                                       const char *key);
 int connman_network_set_blob(struct connman_network *network,
                        const char *key, const void *data, unsigned int size);
 const void *connman_network_get_blob(struct connman_network *network,
diff --git a/src/network.c b/src/network.c
index 3a6372b..80a0383 100644
--- a/src/network.c
+++ b/src/network.c
@@ -1464,6 +1464,26 @@ int connman_network_set_strength(struct connman_network 
*network,
        return 0;
 }
 
+int connman_network_set_frequency(struct connman_network *network,
+                                               connman_uint16_t frequency)
+{
+       DBG("network %p frequency %d", network, frequency);
+
+       network->frequency = frequency;
+
+       return 0;
+}
+
+int connman_network_set_wifi_channel(struct connman_network *network,
+                                               connman_uint16_t channel)
+{
+       DBG("network %p wifi channel %d", network, channel);
+
+       network->wifi.channel = channel;
+
+       return 0;
+}
+
 const char *connman_network_get_name(struct connman_network *network)
 {
        return network->name;
@@ -1554,45 +1574,14 @@ connman_uint8_t connman_network_get_strength(struct 
connman_network *network)
        return network->strength;
 }
 
-/**
- * connman_network_set_uint16:
- * @network: network structure
- * @key: unique identifier
- * @value: integer value
- *
- * Set integer value for specific key
- */
-int connman_network_set_uint16(struct connman_network *network,
-                               const char *key, connman_uint16_t value)
+connman_uint16_t connman_network_get_frequency(struct connman_network *network)
 {
-       DBG("network %p key %s value %d", network, key, value);
-
-       if (g_str_equal(key, "Frequency") == TRUE)
-               network->frequency = value;
-       else if (g_str_equal(key, "WiFi.Channel") == TRUE)
-               network->wifi.channel = value;
-
-       return -EINVAL;
+       return network->frequency;
 }
 
-/**
- * connman_network_get_uint16:
- * @network: network structure
- * @key: unique identifier
- *
- * Get integer value for specific key
- */
-connman_uint16_t connman_network_get_uint16(struct connman_network *network,
-                                                       const char *key)
+connman_uint16_t connman_network_get_wifi_channel(struct connman_network 
*network)
 {
-       DBG("network %p key %s", network, key);
-
-       if (g_str_equal(key, "Frequency") == TRUE)
-               return network->frequency;
-       else if (g_str_equal(key, "WiFi.Channel") == TRUE)
-               return network->wifi.channel;
-
-       return 0;
+       return network->wifi.channel;
 }
 
 /**
-- 
1.7.5.2

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