res_pjsip_mwi.c: Eliminate RAII_VAR in contact delete observer

Change-Id: I0bc97c6608de1d1a4228826b3b3be43f162f05f3

diff --git a/res/res_pjsip_mwi.c b/res/res_pjsip_mwi.c
index f73f10cd69223d3163b17c072e66ed1d6ac7b8ef..cc4b40a04d37d23513cc33d94bd9afa229e3c3e3 100644 (file)
--- a/res/res_pjsip_mwi.c
+++ b/res/res_pjsip_mwi.c
@@ -1235,8 +1235,8 @@ static void mwi_contact_deleted(const void *object)
        const struct ast_sip_contact *contact = object;
        struct ao2_iterator *mwi_subs;
        struct mwi_subscription *mwi_sub;
-       RAII_VAR(struct ast_sip_endpoint *, endpoint, NULL, ao2_cleanup);
-       RAII_VAR(struct ast_sip_contact *, found_contact, NULL, ao2_cleanup);
+       struct ast_sip_endpoint *endpoint = NULL;
+       struct ast_sip_contact *found_contact;
 
        if (contact->endpoint) {
                endpoint = ao2_bump(contact->endpoint);
@@ -1247,12 +1247,15 @@ static void mwi_contact_deleted(const void *object)
        }
 
        if (!endpoint || ast_strlen_zero(endpoint->subscription.mwi.mailboxes)) {
+               ao2_cleanup(endpoint);
                return;
        }
 
        /* Check if there is another contact */
        found_contact = ast_sip_location_retrieve_contact_from_aor_list(endpoint->aors);
+       ao2_cleanup(endpoint);
        if (found_contact) {
+               ao2_cleanup(found_contact);
                return;
        }