From: Nicholas Clark <nick@ccl4.org>
Date: Sat, 6 Oct 2007 21:23:23 +0000 (+0000)
Subject: Remove remaining C<Nullch>s and C<Nullsv>s
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=1a9a51d4aa4d59879a3ad23406cec5aa050b7b1f;p=p5sagit%2Fp5-mst-13.2.git

Remove remaining C<Nullch>s and C<Nullsv>s

p4raw-id: //depot/perl@32054
---

diff --git a/dump.c b/dump.c
index beeba77..aa1228b 100644
--- a/dump.c
+++ b/dump.c
@@ -2115,7 +2115,7 @@ Perl_xmldump_sub(pTHX_ const GV *gv)
 {
     SV * const sv = sv_newmortal();
 
-    gv_fullname3(sv, gv, Nullch);
+    gv_fullname3(sv, gv, NULL);
     Perl_xmldump_indent(aTHX_ 0, PL_xmlfp, "\nSUB %s = ", SvPVX(sv));
     if (CvXSUB(GvCV(gv)))
 	Perl_xmldump_indent(aTHX_ 0, PL_xmlfp, "(xsub 0x%"UVxf" %d)\n",
@@ -2132,7 +2132,7 @@ Perl_xmldump_form(pTHX_ const GV *gv)
 {
     SV * const sv = sv_newmortal();
 
-    gv_fullname3(sv, gv, Nullch);
+    gv_fullname3(sv, gv, NULL);
     Perl_xmldump_indent(aTHX_ 0, PL_xmlfp, "\nFORMAT %s = ", SvPVX(sv));
     if (CvROOT(GvFORM(gv)))
 	op_xmldump(CvROOT(GvFORM(gv)));
@@ -2748,7 +2748,7 @@ Perl_do_op_xmldump(pTHX_ I32 level, PerlIO *file, const OP *o)
 	    ENTER;
 	    SAVEFREESV(tmpsv1);
 	    SAVEFREESV(tmpsv2);
-	    gv_fullname3(tmpsv1, (GV*)cSVOPo->op_sv, Nullch);
+	    gv_fullname3(tmpsv1, (GV*)cSVOPo->op_sv, NULL);
 	    s = SvPV(tmpsv1,len);
 	    sv_catxmlpvn(tmpsv2, s, len, 1);
 	    S_xmldump_attr(aTHX_ level, file, "gv=\"%s\"", SvPV(tmpsv2, len));
diff --git a/perl.c b/perl.c
index 3371b84..f48b1e4 100644
--- a/perl.c
+++ b/perl.c
@@ -2179,11 +2179,11 @@ S_parse_body(pTHX_ char **env, XSINIT_t xsinit)
 	    if (!PL_xmlfp)
 		Perl_croak(aTHX_ "Can't open %s", s);
 	}
-	my_setenv("PERL_XMLDUMP", Nullch);	/* hide from subprocs */
+	my_setenv("PERL_XMLDUMP", NULL);	/* hide from subprocs */
     }
     if ((s = PerlEnv_getenv("PERL_MADSKILLS"))) {
 	PL_madskills = atoi(s);
-	my_setenv("PERL_MADSKILLS", Nullch);	/* hide from subprocs */
+	my_setenv("PERL_MADSKILLS", NULL);	/* hide from subprocs */
     }
 #endif
 
diff --git a/perly.act b/perly.act
index 5e034ea..61c8f5b 100644
--- a/perly.act
+++ b/perly.act
@@ -165,7 +165,7 @@ case 2:
 
   case 24:
 #line 263 "perly.y"
-    { (yyval.opval) = newFOROP(0, Nullch, (line_t)IVAL((ps[(2) - (3)].val.i_tkval)),
+    { (yyval.opval) = newFOROP(0, NULL, (line_t)IVAL((ps[(2) - (3)].val.i_tkval)),
 					Nullop, (ps[(3) - (3)].val.opval), (ps[(1) - (3)].val.opval), Nullop);
 			  TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),((LISTOP*)(yyval.opval))->op_first->op_sibling,'w');
 			;}
@@ -403,10 +403,10 @@ case 2:
     {
 #ifdef MAD
 			  YYSTYPE tmplval;
-			  tmplval.pval = Nullch;
+			  tmplval.pval = NULL;
 			  (yyval.p_tkval) = newTOKEN(OP_NULL, tmplval, 0);
 #else
-			  (yyval.p_tkval) = Nullch;
+			  (yyval.p_tkval) = NULL;
 #endif
 			;}
     break;
diff --git a/perly.y b/perly.y
index e649dbc..4dac4d0 100644
--- a/perly.y
+++ b/perly.y
@@ -260,7 +260,7 @@ sideff	:	error
 			  TOKEN_GETMAD($2,$$,'w');
 			}
 	|	expr FOR expr
-			{ $$ = newFOROP(0, Nullch, (line_t)IVAL($2),
+			{ $$ = newFOROP(0, NULL, (line_t)IVAL($2),
 					Nullop, $3, $1, Nullop);
 			  TOKEN_GETMAD($2,((LISTOP*)$$)->op_first->op_sibling,'w');
 			}
@@ -467,10 +467,10 @@ label	:	/* empty */
 			{
 #ifdef MAD
 			  YYSTYPE tmplval;
-			  tmplval.pval = Nullch;
+			  tmplval.pval = NULL;
 			  $$ = newTOKEN(OP_NULL, tmplval, 0);
 #else
-			  $$ = Nullch;
+			  $$ = NULL;
 #endif
 			}
 	|	LABEL
diff --git a/toke.c b/toke.c
index 2b47e13..95be7d4 100644
--- a/toke.c
+++ b/toke.c
@@ -5725,7 +5725,7 @@ Perl_yylex(pTHX)
 			PL_realtokenstart = -1;
 		    }
 		    while ((s = filter_gets(PL_endwhite, PL_rsfp,
-				 SvCUR(PL_endwhite))) != Nullch) ;
+				 SvCUR(PL_endwhite))) != NULL) ;
 		}
 #endif
 		PL_rsfp = NULL;
@@ -6699,7 +6699,7 @@ Perl_yylex(pTHX)
 		    CURMAD('Q', PL_thisclose);
 		    NEXTVAL_NEXTTOKE.opval =
 			(OP*)newSVOP(OP_CONST, 0, PL_lex_stuff);
-		    PL_lex_stuff = Nullsv;
+		    PL_lex_stuff = NULL;
 		    force_next(THING);
 
 		    s = SKIPSPACE2(s,tmpwhite);