[PATCH] Exchange deprecated g_amotic_int_exchange_and_connect

[Daniel Wagner]

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

This function was deprecated in version 2.30 and since then
we have the g_atomic_int_add() which is essentially the same.
---

Hi,

Finally with the upcoming F16 release, we have to fix this .)

cheers,
daniel

 src/notifier.c   |    6 +++---
 src/task.c       |    2 +-
 src/technology.c |    2 +-
 src/tethering.c  |    2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/notifier.c b/src/notifier.c
index 722f997..b5b072e 100644
--- a/src/notifier.c
+++ b/src/notifier.c
@@ -234,7 +234,7 @@ void __connman_notifier_register(enum connman_service_type 
type)
                break;
        }
 
-       if (g_atomic_int_exchange_and_add(&registered[type], 1) == 0)
+       if (g_atomic_int_add(&registered[type], 1) == 0)
                technology_registered(type, TRUE);
 }
 
@@ -285,7 +285,7 @@ void __connman_notifier_enable(enum connman_service_type 
type)
                break;
        }
 
-       if (g_atomic_int_exchange_and_add(&enabled[type], 1) == 0)
+       if (g_atomic_int_add(&enabled[type], 1) == 0)
                technology_enabled(type, TRUE);
 }
 
@@ -336,7 +336,7 @@ void __connman_notifier_connect(enum connman_service_type 
type)
                break;
        }
 
-       if (g_atomic_int_exchange_and_add(&connected[type], 1) == 0)
+       if (g_atomic_int_add(&connected[type], 1) == 0)
                technology_connected(type, TRUE);
 }
 
diff --git a/src/task.c b/src/task.c
index 2fd2567..a3bc452 100644
--- a/src/task.c
+++ b/src/task.c
@@ -105,7 +105,7 @@ struct connman_task *connman_task_create(const char 
*program)
        if (task == NULL)
                return NULL;
 
-       counter = g_atomic_int_exchange_and_add(&task_counter, 1);
+       counter = g_atomic_int_add(&task_counter, 1);
 
        task->path = g_strdup_printf("/task/%d", counter);
        task->pid = -1;
diff --git a/src/technology.c b/src/technology.c
index c6fd826..cc2a38d 100644
--- a/src/technology.c
+++ b/src/technology.c
@@ -809,7 +809,7 @@ int __connman_technology_enabled(enum connman_service_type 
type)
        if (technology == NULL)
                return -ENXIO;
 
-       if (g_atomic_int_exchange_and_add(&technology->enabled, 1) == 0) {
+       if (g_atomic_int_add(&technology->enabled, 1) == 0) {
                __connman_notifier_enable(type);
                technology->state = CONNMAN_TECHNOLOGY_STATE_ENABLED;
                state_changed(technology);
diff --git a/src/tethering.c b/src/tethering.c
index 0357530..85f6afe 100644
--- a/src/tethering.c
+++ b/src/tethering.c
@@ -339,7 +339,7 @@ void __connman_tethering_set_enabled(void)
 
        DBG("enabled %d", tethering_enabled + 1);
 
-       if (g_atomic_int_exchange_and_add(&tethering_enabled, 1) == 0) {
+       if (g_atomic_int_add(&tethering_enabled, 1) == 0) {
                const char *dns;
 
                err = create_bridge(BRIDGE_NAME);
-- 
1.7.6.4

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