From: Nicholas Clark <nick@ccl4.org>
Date: Fri, 16 Dec 2005 21:30:34 +0000 (+0000)
Subject: s/Nullav/NULL/g
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=7d49f6898e172f330a81e972c5944fc5726fcbf3;p=p5sagit%2Fp5-mst-13.2.git

s/Nullav/NULL/g

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

diff --git a/cop.h b/cop.h
index ff09420..09858b2 100644
--- a/cop.h
+++ b/cop.h
@@ -166,7 +166,7 @@ struct cop {
 #  define CopFILESV(c)		(CopFILE(c) \
 				 ? GvSV(gv_fetchfile(CopFILE(c))) : Nullsv)
 #  define CopFILEAV(c)		(CopFILE(c) \
-				 ? GvAV(gv_fetchfile(CopFILE(c))) : Nullav)
+				 ? GvAV(gv_fetchfile(CopFILE(c))) : NULL)
 #  define CopSTASHPV(c)		((c)->cop_stashpv)
 
 #  ifdef NETWARE
@@ -191,7 +191,7 @@ struct cop {
 #  define CopFILEGV_set(c,gv)	((c)->cop_filegv = (GV*)SvREFCNT_inc(gv))
 #  define CopFILE_set(c,pv)	CopFILEGV_set((c), gv_fetchfile(pv))
 #  define CopFILESV(c)		(CopFILEGV(c) ? GvSV(CopFILEGV(c)) : Nullsv)
-#  define CopFILEAV(c)		(CopFILEGV(c) ? GvAV(CopFILEGV(c)) : Nullav)
+#  define CopFILEAV(c)		(CopFILEGV(c) ? GvAV(CopFILEGV(c)) : NULL)
 #  define CopFILE(c)		(CopFILESV(c) ? SvPVX(CopFILESV(c)) : Nullch)
 #  define CopSTASH(c)		((c)->cop_stash)
 #  define CopSTASH_set(c,hv)	((c)->cop_stash = (hv))
@@ -400,7 +400,7 @@ struct block_loop {
 	cx->blk_loop.next_op = cLOOP->op_nextop;			\
 	cx->blk_loop.last_op = cLOOP->op_lastop;			\
 	cx->blk_loop.iterlval = Nullsv;					\
-	cx->blk_loop.iterary = Nullav;					\
+	cx->blk_loop.iterary = NULL;					\
 	cx->blk_loop.iterix = -1;					\
 	CX_ITERDATA_SET(cx,dat);
 
diff --git a/ext/Data/Dumper/Dumper.xs b/ext/Data/Dumper/Dumper.xs
index e6940a3..109d249 100644
--- a/ext/Data/Dumper/Dumper.xs
+++ b/ext/Data/Dumper/Dumper.xs
@@ -252,7 +252,7 @@ DD_dump(pTHX_ SV *val, const char *name, STRLEN namelen, SV *retval, HV *seenhv,
     SV **svp;
     SV *sv, *ipad, *ival;
     SV *blesspad = Nullsv;
-    AV *seenentry = Nullav;
+    AV *seenentry = NULL;
     char *iname;
     STRLEN inamelen, idlen = 0;
     U32 realtype;
@@ -532,7 +532,7 @@ DD_dump(pTHX_ SV *val, const char *name, STRLEN namelen, SV *retval, HV *seenhv,
 	    char *key;
 	    I32 klen;
 	    SV *hval;
-	    AV *keys = Nullav;
+	    AV *keys = NULL;
 	
 	    iname = newSVpvn(name, namelen);
 	    if (name[0] == '%') {
@@ -965,7 +965,7 @@ Data_Dumper_Dumpxs(href, ...)
 		    (void)sv_2mortal(href);
 	    }
 
-	    todumpav = namesav = Nullav;
+	    todumpav = namesav = NULL;
 	    seenhv = Nullhv;
 	    val = pad = xpad = apad = sep = pair = varname
 		= freezer = toaster = bless = sortkeys = &PL_sv_undef;
diff --git a/gv.c b/gv.c
index 0ad4c0f..af75bec 100644
--- a/gv.c
+++ b/gv.c
@@ -273,7 +273,7 @@ Perl_gv_fetchmeth(pTHX_ HV *stash, const char *name, STRLEN len, I32 level)
     }
 
     gvp = (GV**)hv_fetch(stash, "ISA", 3, FALSE);
-    av = (gvp && (gv = *gvp) && gv != (GV*)&PL_sv_undef) ? GvAV(gv) : Nullav;
+    av = (gvp && (gv = *gvp) && gv != (GV*)&PL_sv_undef) ? GvAV(gv) : NULL;
 
     /* create and re-create @.*::SUPER::ISA on demand */
     if (!av || !SvMAGIC(av)) {
diff --git a/intrpvar.h b/intrpvar.h
index 9b95aad..e45e23d 100644
--- a/intrpvar.h
+++ b/intrpvar.h
@@ -203,7 +203,7 @@ PERLVAR(Imodglobal,	HV *)		/* per-interp module data */
 /* these used to be in global before 5.004_68 */
 PERLVARI(Iprofiledata,	U32 *,	NULL)	/* table of ops, counts */
 PERLVARI(Irsfp,	PerlIO * VOL,	Nullfp) /* current source file pointer */
-PERLVARI(Irsfp_filters,	AV *,	Nullav)	/* keeps active source filters */
+PERLVARI(Irsfp_filters,	AV *,	NULL)	/* keeps active source filters */
 
 PERLVAR(Icompiling,	COP)		/* compiling/done executing marker */
 
@@ -411,7 +411,7 @@ PERLVAR(IProc,		struct IPerlProc*)
 #if defined(USE_ITHREADS)
 PERLVAR(Iptr_table,	PTR_TBL_t*)
 #endif
-PERLVARI(Ibeginav_save, AV*, Nullav)	/* save BEGIN{}s when compiling */
+PERLVARI(Ibeginav_save, AV*, NULL)	/* save BEGIN{}s when compiling */
 
 PERLVARA(Ibody_arenaroots, SVt_LAST, void*) /* consolidated body-arena pointers */
 
@@ -466,7 +466,7 @@ PERLVAR(Iutf8_idcont,	SV *)
 
 PERLVAR(Isort_RealCmp,  SVCOMPARE_t)
 
-PERLVARI(Icheckav_save, AV*, Nullav)	/* save CHECK{}s when compiling */
+PERLVARI(Icheckav_save, AV*, NULL)	/* save CHECK{}s when compiling */
 
 PERLVARI(Iclocktick, long, 0)	/* this many times() ticks in a second */
 
diff --git a/pad.c b/pad.c
index a98d6ef..7fb8921 100644
--- a/pad.c
+++ b/pad.c
@@ -297,7 +297,7 @@ Perl_pad_undef(pTHX_ CV* cv)
 	if (!sv)
 	    continue;
 	if (sv == (SV*)PL_comppad_name)
-	    PL_comppad_name = Nullav;
+	    PL_comppad_name = NULL;
 	else if (sv == (SV*)PL_comppad) {
 	    PL_comppad = Null(PAD*);
 	    PL_curpad = Null(SV**);
diff --git a/perl.c b/perl.c
index 4b005b6..355b1a2 100644
--- a/perl.c
+++ b/perl.c
@@ -840,7 +840,7 @@ perl_destruct(pTHXx)
         }
     }
     SvREFCNT_dec(PL_regex_padav);
-    PL_regex_padav = Nullav;
+    PL_regex_padav = NULL;
     PL_regex_pad = NULL;
 #endif
 
@@ -856,7 +856,7 @@ perl_destruct(pTHXx)
 
     /* Filters for program text */
     SvREFCNT_dec(PL_rsfp_filters);
-    PL_rsfp_filters = Nullav;
+    PL_rsfp_filters = NULL;
 
     /* switches */
     PL_preprocess   = FALSE;
@@ -923,12 +923,12 @@ perl_destruct(pTHXx)
     SvREFCNT_dec(PL_checkav);
     SvREFCNT_dec(PL_checkav_save);
     SvREFCNT_dec(PL_initav);
-    PL_beginav = Nullav;
-    PL_beginav_save = Nullav;
-    PL_endav = Nullav;
-    PL_checkav = Nullav;
-    PL_checkav_save = Nullav;
-    PL_initav = Nullav;
+    PL_beginav = NULL;
+    PL_beginav_save = NULL;
+    PL_endav = NULL;
+    PL_checkav = NULL;
+    PL_checkav_save = NULL;
+    PL_initav = NULL;
 
     /* shortcuts just get cleared */
     PL_envgv = Nullgv;
@@ -949,16 +949,16 @@ perl_destruct(pTHXx)
     PL_DBsignal = Nullsv;
     PL_DBassertion = Nullsv;
     PL_DBcv = Nullcv;
-    PL_dbargs = Nullav;
+    PL_dbargs = NULL;
     PL_debstash = Nullhv;
 
     SvREFCNT_dec(PL_argvout_stack);
-    PL_argvout_stack = Nullav;
+    PL_argvout_stack = NULL;
 
     SvREFCNT_dec(PL_modglobal);
     PL_modglobal = Nullhv;
     SvREFCNT_dec(PL_preambleav);
-    PL_preambleav = Nullav;
+    PL_preambleav = NULL;
     SvREFCNT_dec(PL_subname);
     PL_subname = Nullsv;
     SvREFCNT_dec(PL_linestr);
@@ -1082,7 +1082,7 @@ perl_destruct(pTHXx)
 
     AvREAL_off(PL_fdpid);		/* no surviving entries */
     SvREFCNT_dec(PL_fdpid);		/* needed in io_close() */
-    PL_fdpid = Nullav;
+    PL_fdpid = NULL;
 
 #ifdef HAVE_INTERP_INTERN
     sys_intern_clear();
@@ -2360,7 +2360,7 @@ Perl_get_av(pTHX_ const char *name, I32 create)
     	return GvAVn(gv);
     if (gv)
 	return GvAV(gv);
-    return Nullav;
+    return NULL;
 }
 
 /*
diff --git a/pp.c b/pp.c
index eeb82c0..b260ff1 100644
--- a/pp.c
+++ b/pp.c
@@ -4404,7 +4404,7 @@ PP(pp_split)
     else if (gimme != G_ARRAY)
 	ary = GvAVn(PL_defgv);
     else
-	ary = Nullav;
+	ary = NULL;
     if (ary && (gimme != G_ARRAY || (pm->op_pmflags & PMf_ONCE))) {
 	realarray = 1;
 	PUTBACK;
diff --git a/pp_ctl.c b/pp_ctl.c
index 52b390a..a3f76cf 100644
--- a/pp_ctl.c
+++ b/pp_ctl.c
@@ -3337,7 +3337,7 @@ PP(pp_require)
     SAVETMPS;
     lex_start(sv_2mortal(newSVpvn("",0)));
     SAVEGENERICSV(PL_rsfp_filters);
-    PL_rsfp_filters = Nullav;
+    PL_rsfp_filters = NULL;
 
     PL_rsfp = tryrsfp;
     SAVEHINTS();
diff --git a/pp_sort.c b/pp_sort.c
index 7c8ab2f..652d12a 100644
--- a/pp_sort.c
+++ b/pp_sort.c
@@ -1476,7 +1476,7 @@ PP(pp_sort)
     dVAR; dSP; dMARK; dORIGMARK;
     register SV **p1 = ORIGMARK+1, **p2;
     register I32 max, i;
-    AV* av = Nullav;
+    AV* av = NULL;
     HV *stash;
     GV *gv;
     CV *cv = 0;
diff --git a/scope.c b/scope.c
index 4806316..6a862a4 100644
--- a/scope.c
+++ b/scope.c
@@ -676,7 +676,7 @@ Perl_leave_scope(pTHX_ I32 base)
 	case SAVEt_SVREF:			/* scalar reference */
 	    value = (SV*)SSPOPPTR;
 	    ptr = SSPOPPTR;
-	    av = Nullav; /* what to refcnt_dec */
+	    av = NULL; /* what to refcnt_dec */
 	restore_sv:
 	    sv = *(SV**)ptr;
 	    DEBUG_S(PerlIO_printf(Perl_debug_log,
diff --git a/sv.c b/sv.c
index b2a2fef..bb351f7 100644
--- a/sv.c
+++ b/sv.c
@@ -520,7 +520,7 @@ do_clean_all(pTHX_ SV *sv)
     DEBUG_D((PerlIO_printf(Perl_debug_log, "Cleaning loops: SV at 0x%"UVxf"\n", PTR2UV(sv)) ));
     SvFLAGS(sv) |= SVf_BREAK;
     if (PL_comppad == (AV*)sv) {
-	PL_comppad = Nullav;
+	PL_comppad = NULL;
 	PL_curpad = Null(SV**);
     }
     SvREFCNT_dec(sv);
@@ -9555,7 +9555,7 @@ Perl_cx_dup(pTHX_ PERL_CONTEXT *cxs, I32 ix, I32 max, CLONE_PARAMS* param)
 					   : cv_dup(cx->blk_sub.cv,param));
 		ncx->blk_sub.argarray	= (cx->blk_sub.hasargs
 					   ? av_dup_inc(cx->blk_sub.argarray, param)
-					   : Nullav);
+					   : NULL);
 		ncx->blk_sub.savearray	= av_dup_inc(cx->blk_sub.savearray, param);
 		ncx->blk_sub.olddepth	= cx->blk_sub.olddepth;
 		ncx->blk_sub.hasargs	= cx->blk_sub.hasargs;