Add a new function Perl_hv_common_key_len(), which contains the

manipulations to convert negative lengths to positive length + UTF-8
flag. hv_delete(), hv_exists(), hv_fetch(), hv_store() and
hv_store_flags() all become mathoms. The macros hv_fetchs() and
hv_stores() call hv_common() directly.

p4raw-id: //depot/perl@31931

1 files changed, 18 insertions, 77 deletions

diff --git a/hv.c b/hv.c
index ab9cd12756..9597db6d58 100644
--- a/hv.c
+++ b/hv.c
@@ -239,31 +239,6 @@ information on how to use this function on tied hashes.
 =cut
 */
 
-SV**
-Perl_hv_store(pTHX_ HV *hv, const char *key, I32 klen_i32, SV *val, U32 hash)
-{
-    STRLEN klen;
-    int flags;
-
-    if (klen_i32 < 0) {
-	klen = -klen_i32;
-	flags = HVhek_UTF8;
-    } else {
-	klen = klen_i32;
-	flags = 0;
-    }
-    return (SV **) hv_common(hv, NULL, key, klen, flags,
-			     (HV_FETCH_ISSTORE|HV_FETCH_JUST_SV), val, hash);
-}
-
-SV**
-Perl_hv_store_flags(pTHX_ HV *hv, const char *key, I32 klen, SV *val,
-                 register U32 hash, int flags)
-{
-    return (SV**) hv_common(hv, NULL, key, klen, flags,
-			    (HV_FETCH_ISSTORE|HV_FETCH_JUST_SV), val, hash);
-}
-
 /*
 =for apidoc hv_store_ent
 
@@ -302,23 +277,6 @@ C<klen> is the length of the key.
 =cut
 */
 
-bool
-Perl_hv_exists(pTHX_ HV *hv, const char *key, I32 klen_i32)
-{
-    STRLEN klen;
-    int flags;
-
-    if (klen_i32 < 0) {
-	klen = -klen_i32;
-	flags = HVhek_UTF8;
-    } else {
-	klen = klen_i32;
-	flags = 0;
-    }
-    return hv_common(hv, NULL, key, klen, flags, HV_FETCH_ISEXISTS, 0, 0)
-	? TRUE : FALSE;
-}
-
 /*
 =for apidoc hv_fetch
 
@@ -333,24 +291,6 @@ information on how to use this function on tied hashes.
 =cut
 */
 
-SV**
-Perl_hv_fetch(pTHX_ HV *hv, const char *key, I32 klen_i32, I32 lval)
-{
-    STRLEN klen;
-    int flags;
-
-    if (klen_i32 < 0) {
-	klen = -klen_i32;
-	flags = HVhek_UTF8;
-    } else {
-	klen = klen_i32;
-	flags = 0;
-    }
-    return (SV **) hv_common(hv, NULL, key, klen, flags,
-			     lval ? (HV_FETCH_JUST_SV | HV_FETCH_LVALUE)
-			     : HV_FETCH_JUST_SV, NULL, 0);
-}
-
 /*
 =for apidoc hv_exists_ent
 
@@ -380,6 +320,24 @@ information on how to use this function on tied hashes.
 =cut
 */
 
+/* Common code for hv_delete()/hv_exists()/hv_fetch()/hv_store()  */
+void *
+Perl_hv_common_key_len(pTHX_ HV *hv, const char *key, I32 klen_i32,
+		       const int action, SV *val, const U32 hash)
+{
+    STRLEN klen;
+    int flags;
+
+    if (klen_i32 < 0) {
+	klen = -klen_i32;
+	flags = HVhek_UTF8;
+    } else {
+	klen = klen_i32;
+	flags = 0;
+    }
+    return hv_common(hv, NULL, key, klen, flags, action, val, hash);
+}
+
 void *
 Perl_hv_common(pTHX_ HV *hv, SV *keysv, const char *key, STRLEN klen,
 	       int flags, int action, SV *val, register U32 hash)
@@ -931,23 +889,6 @@ will be returned.
 =cut
 */
 
-SV *
-Perl_hv_delete(pTHX_ HV *hv, const char *key, I32 klen_i32, I32 flags)
-{
-    STRLEN klen;
-    int k_flags;
-
-    if (klen_i32 < 0) {
-	klen = -klen_i32;
-	k_flags = HVhek_UTF8;
-    } else {
-	klen = klen_i32;
-	k_flags = 0;
-    }
-    return (SV *) hv_common(hv, NULL, key, klen, k_flags, flags | HV_DELETE,
-			    NULL, 0);
-}
-
 /*
 =for apidoc hv_delete_ent