summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLiong Sauw Ming <ming@teluu.com>2016-12-07 03:24:16 +0000
committerLiong Sauw Ming <ming@teluu.com>2016-12-07 03:24:16 +0000
commit570d7cb7e05ffb202c3f1f4dd87ccf84178a9da8 (patch)
treec01797b751cc57d74aced9f26a09279b619078a1
parent2374f629df8bc471aa0fbb1e0c0dda2e3536d2d8 (diff)
Fixed #1984: Remove the implementation of PJ_HASH_USE_OWN_TOLOWER
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@5494 74dad513-b988-da41-8d7b-12977e46ad98
-rw-r--r--pjlib/include/pj/config_site_sample.h1
-rw-r--r--pjlib/src/pj/hash.c14
2 files changed, 0 insertions, 15 deletions
diff --git a/pjlib/include/pj/config_site_sample.h b/pjlib/include/pj/config_site_sample.h
index 73c017cb..9c3ecc65 100644
--- a/pjlib/include/pj/config_site_sample.h
+++ b/pjlib/include/pj/config_site_sample.h
@@ -477,7 +477,6 @@
# define PJ_DEBUG 0
# define PJSIP_SAFE_MODULE 0
# define PJ_HAS_STRICMP_ALNUM 0
-# define PJ_HASH_USE_OWN_TOLOWER 1
# define PJSIP_UNESCAPE_IN_PLACE 1
# if defined(PJ_WIN32) || defined(PJ_WIN64)
diff --git a/pjlib/src/pj/hash.c b/pjlib/src/pj/hash.c
index 226d680f..f2ea286a 100644
--- a/pjlib/src/pj/hash.c
+++ b/pjlib/src/pj/hash.c
@@ -76,26 +76,12 @@ PJ_DEF(pj_uint32_t) pj_hash_calc_tolower( pj_uint32_t hval,
{
long i;
-#if defined(PJ_HASH_USE_OWN_TOLOWER) && PJ_HASH_USE_OWN_TOLOWER != 0
- for (i=0; i<key->slen; ++i) {
- pj_uint8_t c = key->ptr[i];
- char lower;
- if (c & 64)
- lower = (char)(c | 32);
- else
- lower = (char)c;
- if (result)
- result[i] = lower;
- hval = hval * PJ_HASH_MULTIPLIER + lower;
- }
-#else
for (i=0; i<key->slen; ++i) {
char lower = (char)pj_tolower(key->ptr[i]);
if (result)
result[i] = lower;
hval = hval * PJ_HASH_MULTIPLIER + lower;
}
-#endif
return hval;
}