Skip to content

Commit 410115a

Browse files
Leontmauke
authored andcommitted
Dont call Perl_warn manually in core
Just call warn instead, we've been able to do that for vararg functions since d933027
1 parent dbd0f2f commit 410115a

File tree

13 files changed

+31
-31
lines changed

13 files changed

+31
-31
lines changed

class.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ XS(injected_constructor)
141141
struct xpvhv_aux *aux = HvAUX(stash);
142142

143143
if((items - 1) % 2)
144-
Perl_warn(aTHX_ "Odd number of arguments passed to %" HvNAMEf_QUOTEDPREFIX " constructor",
144+
warn("Odd number of arguments passed to %" HvNAMEf_QUOTEDPREFIX " constructor",
145145
HvNAMEfARG(stash));
146146

147147
if (!aux->xhv_class_initfields_cv) {

dump.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3496,7 +3496,7 @@ Perl_op_class(pTHX_ const OP *o)
34963496
case OA_UNOP_AUX:
34973497
return OPclass_UNOP_AUX;
34983498
}
3499-
Perl_warn(aTHX_ "Can't determine class of operator %s, assuming BASEOP\n",
3499+
warn("Can't determine class of operator %s, assuming BASEOP\n",
35003500
OP_NAME(o));
35013501
return OPclass_BASEOP;
35023502
}

op.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -457,7 +457,7 @@ Perl_Slab_to_ro(pTHX_ OPSLAB *slab)
457457
/*DEBUG_U(PerlIO_printf(Perl_debug_log,"mprotect ->ro %lu at %p\n",
458458
(unsigned long) slab->opslab_size, (void *)slab));*/
459459
if (mprotect(slab, OpSLABSizeBytes(slab->opslab_size), PROT_READ))
460-
Perl_warn(aTHX_ "mprotect for %p %lu failed with %d", (void *)slab,
460+
warn("mprotect for %p %lu failed with %d", (void *)slab,
461461
(unsigned long)slab->opslab_size, errno);
462462
}
463463
}
@@ -476,7 +476,7 @@ Perl_Slab_to_rw(pTHX_ OPSLAB *const slab)
476476
(unsigned long) size, (void *)slab2));*/
477477
if (mprotect((void *)slab2, OpSLABSizeBytes(slab2->opslab_size),
478478
PROT_READ|PROT_WRITE)) {
479-
Perl_warn(aTHX_ "mprotect RW for %p %lu failed with %d", (void *)slab,
479+
warn("mprotect RW for %p %lu failed with %d", (void *)slab,
480480
(unsigned long)slab2->opslab_size, errno);
481481
}
482482
}
@@ -11712,7 +11712,7 @@ S_process_special_blocks(pTHX_ I32 floor, const char *const fullname,
1171211712
* be BEGIN blocks. Which works out, since the INIT
1171311713
* blocks it creates are eval'ed and so are late.
1171411714
*/
11715-
Perl_warn(aTHX_ "Treating %s::INIT block as BEGIN block as workaround",
11715+
warn("Treating %s::INIT block as BEGIN block as workaround",
1171611716
MI_INIT_WORKAROUND_PACK);
1171711717
goto module_install_hack;
1171811718
}

pad.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -358,7 +358,7 @@ Perl_cv_undef_flags(pTHX_ CV *cv, U32 flags)
358358
LEAVE;
359359
}
360360
#ifdef DEBUGGING
361-
else Perl_warn(aTHX_ "Slab leaked from cv %p", (void*)cv);
361+
else warn("Slab leaked from cv %p", (void*)cv);
362362
#endif
363363
}
364364
}
@@ -520,7 +520,7 @@ Perl_cv_forget_slab(pTHX_ CV *cv)
520520
if (CvROOT(cv)) slab = OpSLAB(CvROOT(cv));
521521
else if (CvSTART(cv)) slab = (OPSLAB *)CvSTART(cv);
522522
#ifdef DEBUGGING
523-
else if (slabbed) Perl_warn(aTHX_ "Slab leaked from cv %p", (void*)cv);
523+
else if (slabbed) warn("Slab leaked from cv %p", (void*)cv);
524524
#endif
525525

526526
if (slab) {

perl.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -587,7 +587,7 @@ Perl_dump_sv_child(pTHX_ SV *sv)
587587
}
588588

589589
if (returned_errno || *buffer) {
590-
Perl_warn(aTHX_ "Debug leaking scalars child failed%s%.*s with errno"
590+
warn("Debug leaking scalars child failed%s%.*s with errno"
591591
" %d: %s", (*buffer ? " at " : ""), (int) *buffer, buffer + 1,
592592
returned_errno, Strerror(returned_errno));
593593
}
@@ -5385,7 +5385,7 @@ Perl_my_exit(pTHX_ U32 status)
53855385
}
53865386
if (PL_exit_flags & PERL_EXIT_WARN) {
53875387
PL_exit_flags |= PERL_EXIT_ABORT; /* Protect against reentrant calls */
5388-
Perl_warn(aTHX_ "Unexpected exit %lu", (unsigned long)status);
5388+
warn("Unexpected exit %lu", (unsigned long)status);
53895389
PL_exit_flags &= ~PERL_EXIT_ABORT;
53905390
}
53915391
switch (status) {
@@ -5503,7 +5503,7 @@ Perl_my_failure_exit(pTHX)
55035503
}
55045504
if (PL_exit_flags & PERL_EXIT_WARN) {
55055505
PL_exit_flags |= PERL_EXIT_ABORT; /* Protect against reentrant calls */
5506-
Perl_warn(aTHX_ "Unexpected exit failure %ld", (long)PL_statusvalue);
5506+
warn("Unexpected exit failure %ld", (long)PL_statusvalue);
55075507
PL_exit_flags &= ~PERL_EXIT_ABORT;
55085508
}
55095509
my_exit_jump();

perlio.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -760,7 +760,7 @@ perlio_mg_set(pTHX_ SV *sv, MAGIC *mg)
760760
IO * const io = GvIOn(GV_FROM_REF(sv));
761761
PerlIO * const ifp = IoIFP(io);
762762
PerlIO * const ofp = IoOFP(io);
763-
Perl_warn(aTHX_ "set %" SVf " %p %p %p",
763+
warn("set %" SVf " %p %p %p",
764764
SVfARG(sv), (void*)io, (void*)ifp, (void*)ofp);
765765
}
766766
return 0;
@@ -773,7 +773,7 @@ perlio_mg_get(pTHX_ SV *sv, MAGIC *mg)
773773
IO * const io = GvIOn(GV_FROM_REF(sv));
774774
PerlIO * const ifp = IoIFP(io);
775775
PerlIO * const ofp = IoOFP(io);
776-
Perl_warn(aTHX_ "get %" SVf " %p %p %p",
776+
warn("get %" SVf " %p %p %p",
777777
SVfARG(sv), (void*)io, (void*)ifp, (void*)ofp);
778778
}
779779
return 0;
@@ -782,14 +782,14 @@ perlio_mg_get(pTHX_ SV *sv, MAGIC *mg)
782782
static int
783783
perlio_mg_clear(pTHX_ SV *sv, MAGIC *mg)
784784
{
785-
Perl_warn(aTHX_ "clear %" SVf, SVfARG(sv));
785+
warn("clear %" SVf, SVfARG(sv));
786786
return 0;
787787
}
788788

789789
static int
790790
perlio_mg_free(pTHX_ SV *sv, MAGIC *mg)
791791
{
792-
Perl_warn(aTHX_ "free %" SVf, SVfARG(sv));
792+
warn("free %" SVf, SVfARG(sv));
793793
return 0;
794794
}
795795

@@ -815,7 +815,7 @@ XS(XS_io_MODIFY_SCALAR_ATTRIBUTES)
815815
mg = mg_find(sv, PERL_MAGIC_ext);
816816
mg->mg_virtual = &perlio_vtab;
817817
mg_magical(sv);
818-
Perl_warn(aTHX_ "attrib %" SVf, SVfARG(sv));
818+
warn("attrib %" SVf, SVfARG(sv));
819819
for (i = 2; i < items; i++) {
820820
STRLEN len;
821821
const char * const name = SvPV_const(ST(i), len);

pp_ctl.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1946,7 +1946,7 @@ Perl_qerror(pTHX_ SV *err)
19461946
else if (PL_errors)
19471947
sv_catsv(PL_errors, err);
19481948
else
1949-
Perl_warn(aTHX_ "%" SVf, SVfARG(err));
1949+
warn("%" SVf, SVfARG(err));
19501950

19511951
if (PL_parser) {
19521952
++PL_parser->error_count;

pp_sys.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -576,7 +576,7 @@ PP_wrapped(pp_warn, 0, 1)
576576
}
577577
}
578578
if (SvROK(exsv) && !PL_warnhook)
579-
Perl_warn(aTHX_ "%" SVf, SVfARG(exsv));
579+
warn("%" SVf, SVfARG(exsv));
580580
else warn_sv(exsv);
581581
RETSETYES;
582582
}

scope.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1960,7 +1960,7 @@ Perl_magic_freedestruct(pTHX_ SV* sv, MAGIC* mg) {
19601960

19611961
IV nargs = 0;
19621962
if (PL_phase == PERL_PHASE_DESTRUCT) {
1963-
Perl_warn(aTHX_ "Can't call destructor for 0x%p in global destruction\n", sv);
1963+
warn("Can't call destructor for 0x%p in global destruction\n", sv);
19641964
return 1;
19651965
}
19661966

sv.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4163,7 +4163,7 @@ Perl_sv_buf_to_ro(pTHX_ SV *sv)
41634163
if (!header->readonly) header->readonly = 1;
41644164
# endif
41654165
if (mprotect(header, len, PROT_READ))
4166-
Perl_warn(aTHX_ "mprotect RW for COW string %p %lu failed with %d",
4166+
warn("mprotect RW for COW string %p %lu failed with %d",
41674167
header, len, errno);
41684168
}
41694169

@@ -4175,7 +4175,7 @@ S_sv_buf_to_rw(pTHX_ SV *sv)
41754175
const MEM_SIZE len = header->size;
41764176
PERL_ARGS_ASSERT_SV_BUF_TO_RW;
41774177
if (mprotect(header, len, PROT_READ|PROT_WRITE))
4178-
Perl_warn(aTHX_ "mprotect for COW string %p %lu failed with %d",
4178+
warn("mprotect for COW string %p %lu failed with %d",
41794179
header, len, errno);
41804180
# ifdef PERL_TRACK_MEMPOOL
41814181
header->readonly = 0;

0 commit comments

Comments
 (0)