From 6266c668bc51da52235c6d7e54480fabf564a990 Mon Sep 17 00:00:00 2001 From: Russell Bryant Date: Sat, 15 Nov 2008 04:30:42 +0000 Subject: [PATCH] Merged revisions 157041 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ........ r157041 | russell | 2008-11-14 22:25:57 -0600 (Fri, 14 Nov 2008) | 3 lines Fix a few more places where the case insensitive hash should be used since the comparison is case insensitive. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@157042 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/chan_sip.c | 4 ++-- main/features.c | 4 +++- main/taskprocessor.c | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 9e1fbe2cfa..49fa57c609 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -1653,7 +1653,7 @@ static int peer_hash_cb(const void *obj, const int flags) { const struct sip_peer *peer = obj; - return ast_str_hash(peer->name); + return ast_str_case_hash(peer->name); } /*! @@ -1709,7 +1709,7 @@ static int dialog_hash_cb(const void *obj, const int flags) { const struct sip_pvt *pvt = obj; - return ast_str_hash(pvt->callid); + return ast_str_case_hash(pvt->callid); } /*! diff --git a/main/features.c b/main/features.c index 03eba91038..428daa6965 100644 --- a/main/features.c +++ b/main/features.c @@ -225,12 +225,14 @@ struct ast_bridge_thread_obj static int parkinglot_hash_cb(const void *obj, const int flags) { const struct ast_parkinglot *parkinglot = obj; - return ast_str_hash(parkinglot->name); + + return ast_str_case_hash(parkinglot->name); } static int parkinglot_cmp_cb(void *obj, void *arg, int flags) { struct ast_parkinglot *parkinglot = obj, *parkinglot2 = arg; + return !strcasecmp(parkinglot->name, parkinglot2->name) ? CMP_MATCH | CMP_STOP : 0; } diff --git a/main/taskprocessor.c b/main/taskprocessor.c index 450d579c10..fccee8fdee 100644 --- a/main/taskprocessor.c +++ b/main/taskprocessor.c @@ -331,7 +331,7 @@ static int tps_hash_cb(const void *obj, const int flags) { const struct ast_taskprocessor *tps = obj; - return ast_str_hash(tps->name); + return ast_str_case_hash(tps->name); } /* compare callback for astobj2 */