res_pjsip/location.c: Use the builtin ao2_callback() match function instead.
authorRichard Mudgett <rmudgett@digium.com>
Fri, 21 Aug 2015 16:03:02 +0000 (11:03 -0500)
committerRichard Mudgett <rmudgett@digium.com>
Thu, 10 Sep 2015 18:16:12 +0000 (13:16 -0500)
Change-Id: I364906d6d2bad3472929986704a0286b9a2cbe3f

res/res_pjsip/location.c

index 587e38a..9625f04 100644 (file)
@@ -137,12 +137,6 @@ static int contact_link_static(void *obj, void *arg, int flags)
        return 0;
 }
 
-/*! \brief Simple callback function which returns immediately, used to grab the first contact of an AOR */
-static int contact_find_first(void *obj, void *arg, int flags)
-{
-       return CMP_MATCH | CMP_STOP;
-}
-
 struct ast_sip_contact *ast_sip_location_retrieve_first_aor_contact(const struct ast_sip_aor *aor)
 {
        RAII_VAR(struct ao2_container *, contacts, NULL, ao2_cleanup);
@@ -153,7 +147,8 @@ struct ast_sip_contact *ast_sip_location_retrieve_first_aor_contact(const struct
                return NULL;
        }
 
-       contact = ao2_callback(contacts, 0, contact_find_first, NULL);
+       /* Get the first AOR contact in the container. */
+       contact = ao2_callback(contacts, 0, NULL, NULL);
        return contact;
 }