[ofono-refactor-v2 PATCH 10/17] ofono: don't reuse identifier pending_network

[Pekka . Pessi]

From: Pekka Pessi <pekka.pe...@nokia.com>

---
 plugins/ofono.c |   16 +++++++---------
 1 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/plugins/ofono.c b/plugins/ofono.c
index c92f360..46b26d0 100644
--- a/plugins/ofono.c
+++ b/plugins/ofono.c
@@ -496,8 +496,7 @@ static int network_probe(struct connman_network *network)
 
 static struct connman_network *pending_network;
 
-static gboolean pending_network_is_available(
-               struct connman_network *pending_network)
+static gboolean pending_network_is_available(struct connman_network *network)
 {
        struct connman_device *device;
        struct connman_network *network;
@@ -505,17 +504,17 @@ static gboolean pending_network_is_available(
        char *ident;
 
        /* Modem may be removed during waiting for active reply */
-       device  = connman_network_get_device(pending_network);
+       device  = connman_network_get_device(network);
        if (device == NULL) {
                DBG("Modem is removed");
                return FALSE;
        }
 
-       identifier = connman_network_get_identifier(pending_network);
+       identifier = connman_network_get_identifier(network);
 
        ident = g_strdup(identifier);
 
-       connman_network_unref(pending_network);
+       connman_network_unref(network);
 
        /* network may be removed during waiting for active reply */
        network = connman_device_get_network(device, ident);
@@ -1494,15 +1493,14 @@ static void cleanup_ipconfig(struct connman_element 
*parent)
        parent->ipv4.method = CONNMAN_IPCONFIG_METHOD_UNKNOWN;
 }
 
-static int static_network_set_connected(
-               struct connman_network *pending_network,
-                               struct connman_element *parent,
+static int static_network_set_connected(struct connman_network *network,
+                                       struct connman_element *parent,
                                        connman_bool_t connected)
 {
        if (connected == FALSE)
                cleanup_ipconfig(parent);
 
-       connman_network_set_connected(pending_network, connected);
+       connman_network_set_connected(network, connected);
 
        return 0;
 }
-- 
1.7.0.4

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