Take advantage of the fact that stasis_unsubscribe now returns NULL

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@383169 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/main/channel_internal_api.c b/main/channel_internal_api.c
index d646d8485e27414403374d2d40bdebbc0260596e..0867524d6f14aa875da594d180a0c3444d03235f 100644 (file)
--- a/main/channel_internal_api.c
+++ b/main/channel_internal_api.c
@@ -1367,8 +1367,7 @@ void ast_channel_internal_cleanup(struct ast_channel *chan)
 
        ast_string_field_free_memory(chan);
 
-       stasis_unsubscribe(chan->forwarder);
-       chan->forwarder = NULL;
+       chan->forwarder = stasis_unsubscribe(chan->forwarder);
 
        ao2_cleanup(chan->topic);
        chan->topic = NULL;

diff --git a/main/manager.c b/main/manager.c
index d5d5ccc26e795ae629349e05fefb95cc45ee80f6..821fde8dbe64205e5f98db984aad9223b323b795 100644 (file)
--- a/main/manager.c
+++ b/main/manager.c
@@ -7590,8 +7590,7 @@ static void manager_shutdown(void)
 {
        struct ast_manager_user *user;
 
-       stasis_unsubscribe(channel_state_sub);
-       channel_state_sub = NULL;
+       channel_state_sub = stasis_unsubscribe(channel_state_sub);
 
        if (registered) {
                ast_manager_unregister("Ping");

diff --git a/tests/test_stasis.c b/tests/test_stasis.c
index 36822941e121e7f16a522c987ac23c3bd2bb55e8..fb81ecde3e39f57d8628dfeae943f9b69dc781fe 100644 (file)
--- a/tests/test_stasis.c
+++ b/tests/test_stasis.c
@@ -276,8 +276,7 @@ AST_TEST_DEFINE(subscription_messages)
        ao2_ref(consumer, +1);
        expected_uniqueid = ast_strdup(stasis_subscription_uniqueid(uut));
 
-       stasis_unsubscribe(uut);
-       uut = NULL;
+       uut = stasis_unsubscribe(uut);
        complete = consumer_wait_for_completion(consumer);
        ast_test_validate(test, 1 == complete);
 
@@ -376,8 +375,7 @@ AST_TEST_DEFINE(unsubscribe_stops_messages)
        ast_test_validate(test, NULL != uut);
        ao2_ref(consumer, +1);
 
-       stasis_unsubscribe(uut);
-       uut = NULL;
+       uut = stasis_unsubscribe(uut);
 
        test_data = ao2_alloc(1, NULL);
        ast_test_validate(test, NULL != test_data);