diff options
| author | Richard Mudgett <rmudgett@digium.com> | 2015-06-30 11:14:57 -0500 |
|---|---|---|
| committer | Richard Mudgett <rmudgett@digium.com> | 2015-07-06 15:59:52 -0500 |
| commit | 74be3a50d79b7b76f6c567e63c3adc7d3f1f135d (patch) | |
| tree | 6c84d53971310e579d10e69a1feb093d00fe5e51 /res/res_pjsip_mwi.c | |
| parent | 589e93617a77e2523bda05f5b275d4501a072cd7 (diff) | |
res_pjsip_mwi.c: Eliminate a simple RAII_VAR.
Change-Id: Ib1843f81e826a6c760c424c88eb70c350d9d61da
Diffstat (limited to 'res/res_pjsip_mwi.c')
| -rw-r--r-- | res/res_pjsip_mwi.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/res/res_pjsip_mwi.c b/res/res_pjsip_mwi.c index 1ed39f5a6..17b07e11c 100644 --- a/res/res_pjsip_mwi.c +++ b/res/res_pjsip_mwi.c @@ -633,10 +633,10 @@ static struct mwi_subscription *mwi_create_subscription( static struct mwi_subscription *mwi_subscribe_single( struct ast_sip_endpoint *endpoint, struct ast_sip_subscription *sip_sub, const char *name) { - RAII_VAR(struct ast_sip_aor *, aor, - ast_sip_location_retrieve_aor(name), ao2_cleanup); + struct ast_sip_aor *aor; struct mwi_subscription *sub; + aor = ast_sip_location_retrieve_aor(name); if (!aor) { /*! I suppose it's possible for the AOR to disappear on us * between accepting the subscription and sending the first @@ -647,11 +647,12 @@ static struct mwi_subscription *mwi_subscribe_single( return NULL; } - if (!(sub = mwi_create_subscription(endpoint, sip_sub))) { - return NULL; + sub = mwi_create_subscription(endpoint, sip_sub); + if (sub) { + mwi_on_aor(aor, sub, 0); } - mwi_on_aor(aor, sub, 0); + ao2_ref(aor, -1); return sub; } |