diff options
| author | Kinsey Moore <kmoore@digium.com> | 2013-03-15 12:58:23 +0000 |
|---|---|---|
| committer | Kinsey Moore <kmoore@digium.com> | 2013-03-15 12:58:23 +0000 |
| commit | 8c444f823b4834a426f65a75ae1f3f978a9745d0 (patch) | |
| tree | 861e56b013fbc6628edb7e929a1f2dc31f9f6897 /main/stasis.c | |
| parent | ad5f3a5759a6e86e364811198432dcc7597f6109 (diff) | |
Make stasis unsubscription functions return NULL
Unsubscribing things in Asterisk seems to very commonly follow with
NULLing out the variable that was unsubscribed. This change makes that
a bit simpler.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@383168 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/stasis.c')
| -rw-r--r-- | main/stasis.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/main/stasis.c b/main/stasis.c index d1f11537e..7f18bf5e1 100644 --- a/main/stasis.c +++ b/main/stasis.c @@ -172,7 +172,7 @@ struct stasis_subscription *stasis_subscribe(struct stasis_topic *topic, stasis_ return __stasis_subscribe(topic, callback, data, 1); } -void stasis_unsubscribe(struct stasis_subscription *sub) +struct stasis_subscription *stasis_unsubscribe(struct stasis_subscription *sub) { if (sub) { size_t i; @@ -186,12 +186,13 @@ void stasis_unsubscribe(struct stasis_subscription *sub) topic->subscribers[i] = topic->subscribers[--topic->num_subscribers_current]; /* Unsubscribing unrefs the subscription */ ao2_cleanup(sub); - return; + return NULL; } } ast_log(LOG_ERROR, "Internal error: subscription has invalid topic\n"); } + return NULL; } int stasis_subscription_is_subscribed(const struct stasis_subscription *sub) |