Skip to content

Commit 453b1c0

Browse files
Leontmauke
Leont
authored and
mauke
committed
Use croak_no_modify directly
There never was any good reason to call it by its long name.
1 parent 06c3a62 commit 453b1c0

File tree

11 files changed

+32
-32
lines changed

11 files changed

+32
-32
lines changed

‎av.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -370,7 +370,7 @@ Perl_av_store(pTHX_ AV *av, SSize_t key, SV *val)
370370
}
371371

372372
if (SvREADONLY(av) && key >= AvFILL(av))
373-
Perl_croak_no_modify();
373+
croak_no_modify();
374374

375375
if (!AvREAL(av) && AvREIFY(av))
376376
av_reify(av);
@@ -646,7 +646,7 @@ Perl_av_clear(pTHX_ AV *av)
646646
#endif
647647

648648
if (SvREADONLY(av))
649-
Perl_croak_no_modify();
649+
croak_no_modify();
650650

651651
/* Give any tie a chance to cleanup first */
652652
if (SvRMAGICAL(av)) {
@@ -796,7 +796,7 @@ Perl_av_push(pTHX_ AV *av, SV *val)
796796
assert(SvTYPE(av) == SVt_PVAV);
797797

798798
if (SvREADONLY(av))
799-
Perl_croak_no_modify();
799+
croak_no_modify();
800800

801801
if ((mg = SvTIED_mg((const SV *)av, PERL_MAGIC_tied))) {
802802
Perl_magic_methcall(aTHX_ MUTABLE_SV(av), mg, SV_CONST(PUSH), G_DISCARD, 1,
@@ -828,7 +828,7 @@ Perl_av_pop(pTHX_ AV *av)
828828
assert(SvTYPE(av) == SVt_PVAV);
829829

830830
if (SvREADONLY(av))
831-
Perl_croak_no_modify();
831+
croak_no_modify();
832832
if ((mg = SvTIED_mg((const SV *)av, PERL_MAGIC_tied))) {
833833
retval = Perl_magic_methcall(aTHX_ MUTABLE_SV(av), mg, SV_CONST(POP), 0, 0);
834834
if (retval)
@@ -887,7 +887,7 @@ Perl_av_unshift(pTHX_ AV *av, SSize_t num)
887887
assert(SvTYPE(av) == SVt_PVAV);
888888

889889
if (SvREADONLY(av))
890-
Perl_croak_no_modify();
890+
croak_no_modify();
891891

892892
if ((mg = SvTIED_mg((const SV *)av, PERL_MAGIC_tied))) {
893893
Perl_magic_methcall(aTHX_ MUTABLE_SV(av), mg, SV_CONST(UNSHIFT),
@@ -954,7 +954,7 @@ Perl_av_shift(pTHX_ AV *av)
954954
assert(SvTYPE(av) == SVt_PVAV);
955955

956956
if (SvREADONLY(av))
957-
Perl_croak_no_modify();
957+
croak_no_modify();
958958
if ((mg = SvTIED_mg((const SV *)av, PERL_MAGIC_tied))) {
959959
retval = Perl_magic_methcall(aTHX_ MUTABLE_SV(av), mg, SV_CONST(SHIFT), 0, 0);
960960
if (retval)
@@ -1083,7 +1083,7 @@ Perl_av_delete(pTHX_ AV *av, SSize_t key, I32 flags)
10831083
assert(SvTYPE(av) == SVt_PVAV);
10841084

10851085
if (SvREADONLY(av))
1086-
Perl_croak_no_modify();
1086+
croak_no_modify();
10871087

10881088
if (SvRMAGICAL(av)) {
10891089
const MAGIC * const tied_magic

‎doop.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -592,7 +592,7 @@ Perl_do_trans(pTHX_ SV *sv)
592592
PERL_ARGS_ASSERT_DO_TRANS;
593593

594594
if (SvREADONLY(sv) && ! identical) {
595-
Perl_croak_no_modify();
595+
croak_no_modify();
596596
}
597597
(void)SvPV_const(sv, len);
598598
if (!len)

‎mg.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -735,7 +735,7 @@ Perl_magic_regdatum_set(pTHX_ SV *sv, MAGIC *mg)
735735
PERL_UNUSED_CONTEXT;
736736
PERL_UNUSED_ARG(sv);
737737
PERL_UNUSED_ARG(mg);
738-
Perl_croak_no_modify();
738+
croak_no_modify();
739739
NORETURN_FUNCTION_END;
740740
}
741741

@@ -3010,7 +3010,7 @@ Perl_magic_set(pTHX_ SV *sv, MAGIC *mg)
30103010
*/
30113011
croakparen:
30123012
if (!PL_localizing) {
3013-
Perl_croak_no_modify();
3013+
croak_no_modify();
30143014
}
30153015
}
30163016
return 0;

‎pp.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ S_rv2gv(pTHX_ SV *sv, const bool vivify_sv, const bool strict,
128128
GV *gv;
129129
HV *stash;
130130
if (SvREADONLY(sv))
131-
Perl_croak_no_modify();
131+
croak_no_modify();
132132
gv = MUTABLE_GV(newSV_type(SVt_NULL));
133133
stash = CopSTASH(PL_curcop);
134134
if (SvTYPE(stash) != SVt_PVHV) stash = NULL;
@@ -787,7 +787,7 @@ S_do_chomp(pTHX_ SV *retval, SV *sv, bool chomping)
787787
return count;
788788
}
789789
else if (SvREADONLY(sv)) {
790-
Perl_croak_no_modify();
790+
croak_no_modify();
791791
}
792792

793793
s = SvPV(sv, len);
@@ -6198,7 +6198,7 @@ PP_wrapped(pp_splice, 0, 1)
61986198
}
61996199

62006200
if (SvREADONLY(ary))
6201-
Perl_croak_no_modify();
6201+
croak_no_modify();
62026202

62036203
SP++;
62046204

@@ -6419,7 +6419,7 @@ PP(pp_push)
64196419
U16 old_delaymagic = PL_delaymagic;
64206420

64216421
if (SvREADONLY(ary) && MARK < PL_stack_sp)
6422-
Perl_croak_no_modify();
6422+
croak_no_modify();
64236423
PL_delaymagic = DM_DELAY;
64246424
for (++MARK; MARK <= PL_stack_sp; MARK++) {
64256425
SV *sv;

‎pp_ctl.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ PP(pp_substcont)
273273
}
274274
else {
275275
SV_CHECK_THINKFIRST_COW_DROP(targ);
276-
if (isGV(targ)) Perl_croak_no_modify();
276+
if (isGV(targ)) croak_no_modify();
277277
SvPV_free(targ);
278278
SvPV_set(targ, SvPVX(dstr));
279279
SvCUR_set(targ, SvCUR(dstr));

‎pp_hot.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5278,7 +5278,7 @@ PP(pp_subst)
52785278
|| ( ((SvTYPE(TARG) == SVt_PVGV && isGV_with_GP(TARG))
52795279
|| SvTYPE(TARG) > SVt_PVLV)
52805280
&& !(SvTYPE(TARG) == SVt_PVGV && SvFAKE(TARG)))))
5281-
Perl_croak_no_modify();
5281+
croak_no_modify();
52825282
}
52835283

52845284
orig = SvPV_nomg(TARG, len);
@@ -6710,7 +6710,7 @@ Perl_vivify_ref(pTHX_ SV *sv, U32 to_what)
67106710
SvGETMAGIC(sv);
67116711
if (!SvOK(sv)) {
67126712
if (SvREADONLY(sv))
6713-
Perl_croak_no_modify();
6713+
croak_no_modify();
67146714
prepare_SV_for_RV(sv);
67156715
switch (to_what) {
67166716
case OPpDEREF_SV:

‎pp_sort.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -816,7 +816,7 @@ PP(pp_sort)
816816
(void)POPMARK; /* remove mark associated with ex-OP_AASSIGN */
817817
av = MUTABLE_AV((*PL_stack_sp));
818818
if (SvREADONLY(av))
819-
Perl_croak_no_modify();
819+
croak_no_modify();
820820
max = AvFILL(av) + 1;
821821

822822
I32 oldmark = MARK - PL_stack_base;

‎pp_sys.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1382,7 +1382,7 @@ PP_wrapped(pp_sselect, 4, 0)
13821382
continue;
13831383
if (SvREADONLY(sv)) {
13841384
if (!(SvPOK(sv) && SvCUR(sv) == 0))
1385-
Perl_croak_no_modify();
1385+
croak_no_modify();
13861386
}
13871387
else if (SvIsCOW(sv)) sv_force_normal_flags(sv, 0);
13881388
if (SvPOK(sv)) {

‎regexec.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12003,7 +12003,7 @@ Perl_reg_named_buff(pTHX_ REGEXP * const rx, SV * const key, SV * const value,
1200312003
if (flags & RXapif_FETCH) {
1200412004
return reg_named_buff_fetch(rx, key, flags);
1200512005
} else if (flags & (RXapif_STORE | RXapif_DELETE | RXapif_CLEAR)) {
12006-
Perl_croak_no_modify();
12006+
croak_no_modify();
1200712007
return NULL;
1200812008
} else if (flags & RXapif_EXISTS) {
1200912009
return reg_named_buff_exists(rx, key, flags)
@@ -12352,7 +12352,7 @@ Perl_reg_numbered_buff_store(pTHX_ REGEXP * const rx, const I32 paren,
1235212352
PERL_UNUSED_ARG(value);
1235312353

1235412354
if (!PL_localizing)
12355-
Perl_croak_no_modify();
12355+
croak_no_modify();
1235612356
}
1235712357

1235812358
I32

‎sv.c

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4252,7 +4252,7 @@ Perl_sv_setsv_flags(pTHX_ SV *dsv, SV* ssv, const I32 flags)
42524252

42534253
/* minimal subset of SV_CHECK_THINKFIRST_COW_DROP(dsv) */
42544254
if (SvREADONLY(dsv))
4255-
Perl_croak_no_modify();
4255+
croak_no_modify();
42564256
if (SvROK(dsv)) {
42574257
if (SvWEAKREF(dsv))
42584258
sv_unref_flags(dsv, 0);
@@ -4802,7 +4802,7 @@ Perl_sv_set_undef(pTHX_ SV *sv)
48024802
* variable? Some XS code does this */
48034803
if (sv == &PL_sv_undef)
48044804
return;
4805-
Perl_croak_no_modify();
4805+
croak_no_modify();
48064806
}
48074807

48084808
if (SvROK(sv)) {
@@ -5065,7 +5065,7 @@ Perl_sv_setpvn(pTHX_ SV *const sv, const char *const ptr, const STRLEN len)
50655065

50665066
SV_CHECK_THINKFIRST_COW_DROP(sv);
50675067
if (isGV_with_GP(sv))
5068-
Perl_croak_no_modify();
5068+
croak_no_modify();
50695069
if (!ptr) {
50705070
(void)SvOK_off(sv);
50715071
return;
@@ -5438,7 +5438,7 @@ Perl_sv_force_normal_flags(pTHX_ SV *const sv, const U32 flags)
54385438
PERL_ARGS_ASSERT_SV_FORCE_NORMAL_FLAGS;
54395439

54405440
if (SvREADONLY(sv))
5441-
Perl_croak_no_modify();
5441+
croak_no_modify();
54425442
else if (SvIsCOW(sv) && LIKELY(SvTYPE(sv) != SVt_PVHV))
54435443
S_sv_uncow(aTHX_ sv, flags);
54445444
if (SvROK(sv))
@@ -6002,7 +6002,7 @@ Perl_sv_magic(pTHX_ SV *const sv, SV *const obj, const int how,
60026002
!PERL_MAGIC_TYPE_READONLY_ACCEPTABLE(how)
60036003
)
60046004
{
6005-
Perl_croak_no_modify();
6005+
croak_no_modify();
60066006
}
60076007
}
60086008
if (SvMAGICAL(sv) || (how == PERL_MAGIC_taint && SvTYPE(sv) >= SVt_PVMG)) {
@@ -9306,7 +9306,7 @@ Perl_sv_inc_nomg(pTHX_ SV *const sv)
93069306
return;
93079307
if (SvTHINKFIRST(sv)) {
93089308
if (SvREADONLY(sv)) {
9309-
Perl_croak_no_modify();
9309+
croak_no_modify();
93109310
}
93119311
if (SvROK(sv)) {
93129312
IV i;
@@ -9371,7 +9371,7 @@ Perl_sv_inc_nomg(pTHX_ SV *const sv)
93719371

93729372
/* treat AV/HV/CV/FM/IO and non-fake GVs as immutable */
93739373
if (SvTYPE(sv) >= SVt_PVAV || (isGV_with_GP(sv) && !SvFAKE(sv)))
9374-
Perl_croak_no_modify();
9374+
croak_no_modify();
93759375

93769376
if (!(flags & SVp_POK) || !*SvPVX_const(sv)) {
93779377
if ((flags & SVTYPEMASK) < SVt_PVIV)
@@ -9490,7 +9490,7 @@ Perl_sv_dec_nomg(pTHX_ SV *const sv)
94909490
return;
94919491
if (SvTHINKFIRST(sv)) {
94929492
if (SvREADONLY(sv)) {
9493-
Perl_croak_no_modify();
9493+
croak_no_modify();
94949494
}
94959495
if (SvROK(sv)) {
94969496
IV i;
@@ -9558,7 +9558,7 @@ Perl_sv_dec_nomg(pTHX_ SV *const sv)
95589558

95599559
/* treat AV/HV/CV/FM/IO and non-fake GVs as immutable */
95609560
if (SvTYPE(sv) >= SVt_PVAV || (isGV_with_GP(sv) && !SvFAKE(sv)))
9561-
Perl_croak_no_modify();
9561+
croak_no_modify();
95629562

95639563
if (!(flags & SVp_POK)) {
95649564
if ((flags & SVTYPEMASK) < SVt_PVIV)
@@ -10938,7 +10938,7 @@ Perl_sv_bless(pTHX_ SV *const sv, HV *const stash)
1093810938
tmpRef = SvRV(sv);
1093910939
if (SvFLAGS(tmpRef) & (SVs_OBJECT|SVf_READONLY|SVf_PROTECT)) {
1094010940
if (SvREADONLY(tmpRef))
10941-
Perl_croak_no_modify();
10941+
croak_no_modify();
1094210942
if (SvTYPE(tmpRef) == SVt_PVOBJ)
1094310943
croak("Can't bless an object reference");
1094410944
if (SvOBJECT(tmpRef)) {

0 commit comments

Comments
 (0)