This is a live mirror of the Perl 5 development currently hosted at https://github.com/perl/perl5
Now hv_delete is able to ingore placeholders.
authorNicholas Clark <nick@ccl4.org>
Sat, 7 Feb 2004 21:20:16 +0000 (21:20 +0000)
committerNicholas Clark <nick@ccl4.org>
Sat, 7 Feb 2004 21:20:16 +0000 (21:20 +0000)
(This is an XS visible change in the hash API. But not of documented
behaviour)

p4raw-id: //depot/perl@22280

hv.c

diff --git a/hv.c b/hv.c
index 849154c..097b599 100644 (file)
--- a/hv.c
+++ b/hv.c
@@ -983,21 +983,6 @@ S_hv_delete_common(pTHX_ HV *hv, SV *keysv, const char *key, STRLEN klen,
        /* if placeholder is here, it's already been deleted.... */
        if (HeVAL(entry) == &PL_sv_placeholder)
        {
-           if (SvREADONLY(hv))
-               return Nullsv; /* if still SvREADONLY, leave it deleted. */
-
-           /* okay, really delete the placeholder. */
-           *oentry = HeNEXT(entry);
-           if (i && !*oentry)
-               xhv->xhv_fill--; /* HvFILL(hv)-- */
-           if (entry == xhv->xhv_eiter /* HvEITER(hv) */)
-               HvLAZYDEL_on(hv);
-           else
-               hv_free_ent(hv, entry);
-           xhv->xhv_keys--; /* HvKEYS(hv)-- */
-          if (xhv->xhv_keys == 0)
-               HvHASKFLAGS_off(hv);
-           xhv->xhv_placeholders--;
            return Nullsv;
        }
        else if (SvREADONLY(hv) && HeVAL(entry) && SvREADONLY(HeVAL(entry))) {