X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=doop.c;h=2c1ce81a3875f99f2754302522c06aa1b7b66406;hb=92adfbd49af0758bcc9a198cf2df2bd78c4176b9;hp=1d81ca07f63f223144db79c007b3cbc6f4a3cff0;hpb=a4fc7abc9c5502fa20253f620ede1e956c44caed;p=p5sagit%2Fp5-mst-13.2.git diff --git a/doop.c b/doop.c index 1d81ca0..2c1ce81 100644 --- a/doop.c +++ b/doop.c @@ -722,7 +722,7 @@ Perl_do_sprintf(pTHX_ SV *sv, I32 len, SV **sarg) SvUTF8_off(sv); if (DO_UTF8(*sarg)) SvUTF8_on(sv); - sv_vsetpvfn(sv, pat, patlen, Null(va_list*), sarg + 1, len - 1, &do_taint); + sv_vsetpvfn(sv, pat, patlen, NULL, sarg + 1, len - 1, &do_taint); SvSETMAGIC(sv); if (do_taint) SvTAINTED_on(sv); @@ -1034,7 +1034,7 @@ Perl_do_chomp(pTHX_ register SV *sv) STRLEN len; char *s; char *temp_buffer = NULL; - SV* svrecode = Nullsv; + SV* svrecode = NULL; if (RsSNARF(PL_rs)) return 0; @@ -1371,7 +1371,7 @@ Perl_do_kv(pTHX) if (PL_op->op_flags & OPf_MOD || LVRET) { /* lvalue */ dTARGET; /* make sure to clear its target here */ if (SvTYPE(TARG) == SVt_PVLV) - LvTARG(TARG) = Nullsv; + LvTARG(TARG) = NULL; PUSHs(TARG); } RETURN; @@ -1390,13 +1390,13 @@ Perl_do_kv(pTHX) if (PL_op->op_flags & OPf_MOD || LVRET) { /* lvalue */ if (SvTYPE(TARG) < SVt_PVLV) { sv_upgrade(TARG, SVt_PVLV); - sv_magic(TARG, Nullsv, PERL_MAGIC_nkeys, Nullch, 0); + sv_magic(TARG, NULL, PERL_MAGIC_nkeys, NULL, 0); } LvTYPE(TARG) = 'k'; if (LvTARG(TARG) != (SV*)keys) { if (LvTARG(TARG)) SvREFCNT_dec(LvTARG(TARG)); - LvTARG(TARG) = SvREFCNT_inc(keys); + LvTARG(TARG) = SvREFCNT_inc_simple(keys); } PUSHs(TARG); RETURN;