kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-03 03:20:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

res_pjsip_mwi.c: Eliminate a simple RAII_VAR.

Browse Source 
Change-Id: Ib1843f81e826a6c760c424c88eb70c350d9d61da
This commit is contained in:
Richard Mudgett
2015-06-30 11:14:57 -05:00
parent 786c6d42ef
commit 453d7b8d69
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
res/res_pjsip_mwi.c
View File

@@ -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;
}