diff options
| -rw-r--r-- | apps/app_queue.c | 2 | ||||
| -rw-r--r-- | channels/chan_iax2.c | 6 | ||||
| -rw-r--r-- | main/manager.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/apps/app_queue.c b/apps/app_queue.c index f04e51798..b8267ae09 100644 --- a/apps/app_queue.c +++ b/apps/app_queue.c @@ -797,7 +797,7 @@ static int member_hash_fn(const void *obj, const int flags) static int member_cmp_fn(void *obj1, void *obj2, int flags) { struct member *mem1 = obj1, *mem2 = obj2; - return strcmp(mem1->interface, mem2->interface) ? 0 : CMP_MATCH; + return strcmp(mem1->interface, mem2->interface) ? 0 : CMP_MATCH | CMP_STOP; } static void init_queue(struct call_queue *q) diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index af380e9e5..a7d350784 100644 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -1120,7 +1120,7 @@ static int peer_cmp_cb(void *obj, void *arg, int flags) { struct iax2_peer *peer = obj, *peer2 = arg; - return !strcmp(peer->name, peer2->name) ? CMP_MATCH : 0; + return !strcmp(peer->name, peer2->name) ? CMP_MATCH | CMP_STOP : 0; } /*! @@ -1140,7 +1140,7 @@ static int user_cmp_cb(void *obj, void *arg, int flags) { struct iax2_user *user = obj, *user2 = arg; - return !strcmp(user->name, user2->name) ? CMP_MATCH : 0; + return !strcmp(user->name, user2->name) ? CMP_MATCH | CMP_STOP : 0; } /*! @@ -11117,7 +11117,7 @@ static int pvt_cmp_cb(void *obj, void *arg, int flags) * against a full frame or not ... */ return match(&pvt2->addr, pvt2->peercallno, pvt2->callno, pvt, - pvt2->frames_received) ? CMP_MATCH : 0; + pvt2->frames_received) ? CMP_MATCH | CMP_STOP : 0; } /*! \brief Load IAX2 module, load configuraiton ---*/ diff --git a/main/manager.c b/main/manager.c index c1937ee27..8b10712e8 100644 --- a/main/manager.c +++ b/main/manager.c @@ -318,7 +318,7 @@ static int variable_count_cmp_fn(void *obj, void *vstr, int flags) * the address of both the struct and the string are exactly the same. */ struct variable_count *vc = obj; char *str = vstr; - return !strcmp(vc->varname, str) ? CMP_MATCH : 0; + return !strcmp(vc->varname, str) ? CMP_MATCH | CMP_STOP : 0; } static char *xml_translate(char *in, struct ast_variable *vars) |