Remove WITH_THR() and WITH_THX(), which are not used.

[perl5.git] / hv.c

diff --git a/hv.c b/hv.c
index 0b46ef6..ccd72fd 100644 (file)
--- a/hv.c
+++ b/hv.c
@@ -340,7 +340,7 @@ Perl_hv_common(pTHX_ HV *hv, SV *keysv, const char *key, STRLEN klen,
 
     if (!hv)
        return NULL;
-    if (SvTYPE(hv) == SVTYPEMASK)
+    if (SvTYPE(hv) == (svtype)SVTYPEMASK)
        return NULL;
 
     assert(SvTYPE(hv) == SVt_PVHV);
@@ -1813,7 +1813,7 @@ Perl_hv_undef_flags(pTHX_ HV *hv, U32 flags)
            SvREFCNT_dec(meta->mro_linear_current);
            meta->mro_linear_current = NULL;
        }
-       if(meta->mro_nextmethod) SvREFCNT_dec(meta->mro_nextmethod);
+       SvREFCNT_dec(meta->mro_nextmethod);
        SvREFCNT_dec(meta->isa);
        Safefree(meta);
        aux->xhv_mro_meta = NULL;
@@ -3288,7 +3288,7 @@ Perl_refcounted_he_inc(pTHX_ struct refcounted_he *he)
 }
 
 /*
-=for apidoc fetch_cop_label
+=for apidoc cop_fetch_label
 
 Returns the label attached to a cop.
 The flags pointer may be set to C<SVf_UTF8> or 0.
@@ -3299,10 +3299,10 @@ The flags pointer may be set to C<SVf_UTF8> or 0.
 /* pp_entereval is aware that labels are stored with a key ':' at the top of
    the linked list.  */
 const char *
-Perl_fetch_cop_label(pTHX_ COP *const cop, STRLEN *len, U32 *flags) {
+Perl_cop_fetch_label(pTHX_ COP *const cop, STRLEN *len, U32 *flags) {
     struct refcounted_he *const chain = cop->cop_hints_hash;
 
-    PERL_ARGS_ASSERT_FETCH_COP_LABEL;
+    PERL_ARGS_ASSERT_COP_FETCH_LABEL;
 
     if (!chain)
        return NULL;
@@ -3333,7 +3333,7 @@ Perl_fetch_cop_label(pTHX_ COP *const cop, STRLEN *len, U32 *flags) {
 }
 
 /*
-=for apidoc store_cop_label
+=for apidoc cop_store_label
 
 Save a label into a C<cop_hints_hash>. You need to set flags to C<SVf_UTF8>
 for a utf-8 label.
@@ -3342,14 +3342,14 @@ for a utf-8 label.
 */
 
 void
-Perl_store_cop_label(pTHX_ COP *const cop, const char *label, STRLEN len,
+Perl_cop_store_label(pTHX_ COP *const cop, const char *label, STRLEN len,
                     U32 flags)
 {
     SV *labelsv;
-    PERL_ARGS_ASSERT_STORE_COP_LABEL;
+    PERL_ARGS_ASSERT_COP_STORE_LABEL;
 
     if (flags & ~(SVf_UTF8))
-       Perl_croak(aTHX_ "panic: store_cop_label illegal flag bits 0x%" UVxf,
+       Perl_croak(aTHX_ "panic: cop_store_label illegal flag bits 0x%" UVxf,
                   (UV)flags);
     labelsv = newSVpvn_flags(label, len, SVs_TEMP);
     if (flags & SVf_UTF8)