summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRussell Bryant <russell@russellbryant.com>2008-11-15 04:25:57 +0000
committerRussell Bryant <russell@russellbryant.com>2008-11-15 04:25:57 +0000
commit1148e648b863a5237d0c7b9cd9b6d332559c35c9 (patch)
tree65eb98c9ee1c98c37fd15b6e592c90a08af02fcd
parentab2b24d6eea9cd92efbf0f536044624554e9e021 (diff)
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/trunk@157041 65c4cc65-6c06-0410-ace0-fbb531ad65f3
-rw-r--r--channels/chan_sip.c4
-rw-r--r--main/features.c4
-rw-r--r--main/taskprocessor.c2
3 files changed, 6 insertions, 4 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 70a220bf4..f1601cdff 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -1948,7 +1948,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);
}
/*!
@@ -2004,7 +2004,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 932f1b8a1..055bfa791 100644
--- a/main/features.c
+++ b/main/features.c
@@ -292,12 +292,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, void *data, 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 d8287257e..6fad190f2 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 */