From: Nicholas Clark <nick@ccl4.org>
Date: Sat, 22 Nov 2003 10:37:24 +0000 (+0000)
Subject: Shift negative klen/flags games from hv_exists_common out to hv_exists
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=9b7c1c416b1df37975076158920b5c2b361392c1;p=p5sagit%2Fp5-mst-13.2.git
Shift negative klen/flags games from hv_exists_common out to hv_exists
p4raw-id: //depot/perl@21768
---
diff --git a/embed.fnc b/embed.fnc
index 35cb136..a9d685d 100644
--- a/embed.fnc
+++ b/embed.fnc
@@ -1395,7 +1395,7 @@ Apod |void |hv_assert |HV* tb
#if defined(PERL_IN_HV_C) || defined(PERL_DECL_PROT)
sM |SV* |hv_delete_common|HV* tb|SV* key_sv|const char* key|STRLEN klen|int k_flags|I32 d_flags|U32 hash
-sM |bool |hv_exists_common|HV* tb|SV* key_sv|const char* key|I32 klen|U32 hash
+sM |bool |hv_exists_common|HV* tb|SV* key_sv|const char* key|STRLEN klen|int flags|U32 hash
sM |HE* |hv_fetch_common|HV* tb|SV* key_sv|const char* key|STRLEN klen|int flags|int action|U32 hash
sM |HE* |hv_store_common|HV* tb|SV* key_sv|const char* key|I32 klen|int flags|SV* val|U32 hash
#endif
diff --git a/embed.h b/embed.h
index 67082e6..2bc3260 100644
--- a/embed.h
+++ b/embed.h
@@ -4642,7 +4642,7 @@
#define hv_delete_common(a,b,c,d,e,f,g) S_hv_delete_common(aTHX_ a,b,c,d,e,f,g)
#endif
#ifdef PERL_CORE
-#define hv_exists_common(a,b,c,d,e) S_hv_exists_common(aTHX_ a,b,c,d,e)
+#define hv_exists_common(a,b,c,d,e,f) S_hv_exists_common(aTHX_ a,b,c,d,e,f)
#endif
#ifdef PERL_CORE
#define hv_fetch_common(a,b,c,d,e,f,g) S_hv_fetch_common(aTHX_ a,b,c,d,e,f,g)
diff --git a/hv.c b/hv.c
index 3fad565..b2235fd 100644
--- a/hv.c
+++ b/hv.c
@@ -959,9 +959,19 @@ C<klen> is the length of the key.
*/
bool
-Perl_hv_exists(pTHX_ HV *hv, const char *key, I32 klen)
+Perl_hv_exists(pTHX_ HV *hv, const char *key, I32 klen_i32)
{
- return hv_exists_common(hv, NULL, key, klen, 0);
+ STRLEN klen;
+ int flags;
+
+ if (klen_i32 < 0) {
+ klen = -klen_i32;
+ flags = HVhek_UTF8;
+ } else {
+ klen = klen_i32;
+ flags = 0;
+ }
+ return hv_exists_common(hv, NULL, key, klen, flags, 0);
}
/*
@@ -977,35 +987,29 @@ computed.
bool
Perl_hv_exists_ent(pTHX_ HV *hv, SV *keysv, U32 hash)
{
- return hv_exists_common(hv, keysv, NULL, 0, hash);
+ return hv_exists_common(hv, keysv, NULL, 0, 0, hash);
}
bool
-S_hv_exists_common(pTHX_ HV *hv, SV *keysv, const char *key, I32 klen_i32,
- U32 hash)
+S_hv_exists_common(pTHX_ HV *hv, SV *keysv, const char *key, STRLEN klen,
+ int k_flags, U32 hash)
{
register XPVHV* xhv;
- STRLEN klen;
register HE *entry;
SV *sv;
bool is_utf8;
const char *keysave;
- int k_flags = 0;
+ int masked_flags;
if (!hv)
return 0;
if (keysv) {
key = SvPV(keysv, klen);
+ k_flags = 0;
is_utf8 = (SvUTF8(keysv) != 0);
} else {
- if (klen_i32 < 0) {
- klen = -klen_i32;
- is_utf8 = TRUE;
- } else {
- klen = klen_i32;
- is_utf8 = FALSE;
- }
+ is_utf8 = ((k_flags & HVhek_UTF8) ? TRUE : FALSE);
}
keysave = key;
@@ -1051,16 +1055,28 @@ S_hv_exists_common(pTHX_ HV *hv, SV *keysv, const char *key, I32 klen_i32,
if (is_utf8) {
key = (char*)bytes_from_utf8((U8*)key, &klen, &is_utf8);
+
+ if (k_flags & HVhek_FREEKEY) {
+ /* This shouldn't happen if our caller does what we expect,
+ but strictly the API allows it. */
+ Safefree(keysave);
+ }
+
if (is_utf8)
- k_flags = HVhek_UTF8;
+ k_flags |= HVhek_UTF8;
+ else
+ k_flags &= ~HVhek_UTF8;
if (key != keysave)
- k_flags |= HVhek_FREEKEY;
+ k_flags |= HVhek_WASUTF8 | HVhek_FREEKEY;
}
+
if (HvREHASH(hv)) {
PERL_HASH_INTERNAL(hash, key, klen);
} else if (!hash)
PERL_HASH(hash, key, klen);
+ masked_flags = (k_flags & HVhek_MASK);
+
#ifdef DYNAMIC_ENV_FETCH
if (!xhv->xhv_array /* !HvARRAY(hv) */) entry = Null(HE*);
else
@@ -1074,7 +1090,7 @@ S_hv_exists_common(pTHX_ HV *hv, SV *keysv, const char *key, I32 klen_i32,
continue;
if (HeKEY(entry) != key && memNE(HeKEY(entry),key,klen)) /* is this it? */
continue;
- if ((HeKFLAGS(entry) ^ k_flags) & HVhek_UTF8)
+ if ((HeKFLAGS(entry) ^ masked_flags) & HVhek_UTF8)
continue;
if (k_flags & HVhek_FREEKEY)
Safefree(key);
diff --git a/proto.h b/proto.h
index 7395837..15b6594 100644
--- a/proto.h
+++ b/proto.h
@@ -1336,7 +1336,7 @@ PERL_CALLCONV void Perl_hv_assert(pTHX_ HV* tb);
#if defined(PERL_IN_HV_C) || defined(PERL_DECL_PROT)
STATIC SV* S_hv_delete_common(pTHX_ HV* tb, SV* key_sv, const char* key, STRLEN klen, int k_flags, I32 d_flags, U32 hash);
-STATIC bool S_hv_exists_common(pTHX_ HV* tb, SV* key_sv, const char* key, I32 klen, U32 hash);
+STATIC bool S_hv_exists_common(pTHX_ HV* tb, SV* key_sv, const char* key, STRLEN klen, int flags, U32 hash);
STATIC HE* S_hv_fetch_common(pTHX_ HV* tb, SV* key_sv, const char* key, STRLEN klen, int flags, int action, U32 hash);
STATIC HE* S_hv_store_common(pTHX_ HV* tb, SV* key_sv, const char* key, I32 klen, int flags, SV* val, U32 hash);
#endif