Re: [PATCH] s/Null(gv|hv|sv)/NULL/g

[p5sagit/p5-mst-13.2.git] / gv.c

diff --git a/gv.c b/gv.c
index d06bb8d..955891b 100644 (file)
--- a/gv.c
+++ b/gv.c
@@ -110,7 +110,7 @@ Perl_gv_fetchfile(pTHX_ const char *name)
     GV *gv;
 
     if (!PL_defstash)
-       return Nullgv;
+       return NULL;
 
     tmplen = strlen(name) + 2;
     if (tmplen < sizeof smallbuf)
@@ -130,7 +130,7 @@ Perl_gv_fetchfile(pTHX_ const char *name)
        sv_setpvn(GvSV(gv), name, tmplen - 2);
 #endif
        if (PERLDB_LINE)
-           hv_magic(GvHVn(gv_AVadd(gv)), Nullgv, PERL_MAGIC_dbfile);
+           hv_magic(GvHVn(gv_AVadd(gv)), NULL, PERL_MAGIC_dbfile);
     }
     if (tmpbuf != smallbuf)
        Safefree(tmpbuf);
@@ -313,7 +313,7 @@ Perl_gv_fetchmeth(pTHX_ HV *stash, const char *name, STRLEN len, I32 level)
 
     gvp = (GV**)hv_fetch(stash, name, len, (level >= 0));
     if (!gvp)
-       topgv = Nullgv;
+       topgv = NULL;
     else {
        topgv = *gvp;
        if (SvTYPE(topgv) != SVt_PVGV)
@@ -572,7 +572,7 @@ Perl_gv_autoload4(pTHX_ HV *stash, const char *name, STRLEN len, I32 method)
     STRLEN packname_len;
 
     if (len == S_autolen && strnEQ(name, S_autoload, S_autolen))
-       return Nullgv;
+       return NULL;
     if (stash) {
        if (SvTYPE(stash) < SVt_PVHV) {
            packname = SvPV_const((SV*)stash, packname_len);
@@ -584,11 +584,11 @@ Perl_gv_autoload4(pTHX_ HV *stash, const char *name, STRLEN len, I32 method)
        }
     }
     if (!(gv = gv_fetchmeth(stash, S_autoload, S_autolen, FALSE)))
-       return Nullgv;
+       return NULL;
     cv = GvCV(gv);
 
     if (!(CvROOT(cv) || CvXSUB(cv)))
-       return Nullgv;
+       return NULL;
 
     /*
      * Inheriting AUTOLOAD for non-methods works ... for now.
@@ -652,7 +652,7 @@ S_require_errno(pTHX_ GV *gv)
        ENTER;
        save_scalar(gv); /* keep the value of $! */
         Perl_load_module(aTHX_ PERL_LOADMOD_NOIMPORT,
-                         newSVpvs("Errno"), Nullsv);
+                         newSVpvs("Errno"), NULL);
        LEAVE;
        SPAGAIN;
        stash = gv_stashpvs("Errno", FALSE);
@@ -786,7 +786,7 @@ Perl_gv_fetchpvn_flags(pTHX_ const char *nambeg, STRLEN full_len, I32 flags,
            if (!stash)
                stash = PL_defstash;
            if (!stash || !SvREFCNT(stash)) /* symbol table under destruction */
-               return Nullgv;
+               return NULL;
 
            len = name_cursor - name;
            if (len > 0) {
@@ -802,7 +802,7 @@ Perl_gv_fetchpvn_flags(pTHX_ const char *nambeg, STRLEN full_len, I32 flags,
                tmpbuf[len++] = ':';
                tmpbuf[len] = '\0';
                gvp = (GV**)hv_fetch(stash,tmpbuf,len,add);
-               gv = gvp ? *gvp : Nullgv;
+               gv = gvp ? *gvp : NULL;
                if (gv && gv != (GV*)&PL_sv_undef) {
                    if (SvTYPE(gv) != SVt_PVGV)
                        gv_init(gv, stash, tmpbuf, len, (add & GV_ADDMULTI));
@@ -812,7 +812,7 @@ Perl_gv_fetchpvn_flags(pTHX_ const char *nambeg, STRLEN full_len, I32 flags,
                if (tmpbuf != smallbuf)
                    Safefree(tmpbuf);
                if (!gv || gv == (GV*)&PL_sv_undef)
-                   return Nullgv;
+                   return NULL;
 
                if (!(stash = GvHV(gv)))
                    stash = GvHV(gv) = newHV();
@@ -929,15 +929,15 @@ Perl_gv_fetchpvn_flags(pTHX_ const char *nambeg, STRLEN full_len, I32 flags,
            stash = GvHV(gv_fetchpvn_flags("<none>::", 8, GV_ADDMULTI, SVt_PVHV));
        }
        else
-           return Nullgv;
+           return NULL;
     }
 
     if (!SvREFCNT(stash))      /* symbol table under destruction */
-       return Nullgv;
+       return NULL;
 
     gvp = (GV**)hv_fetch(stash,name,len,add);
     if (!gvp || *gvp == (GV*)&PL_sv_undef)
-       return Nullgv;
+       return NULL;
     gv = *gvp;
     if (SvTYPE(gv) == SVt_PVGV) {
        if (add) {
@@ -1013,7 +1013,7 @@ Perl_gv_fetchpvn_flags(pTHX_ const char *nambeg, STRLEN full_len, I32 flags,
                if (strEQ(name2, "VERLOAD")) {
                    HV* const hv = GvHVn(gv);
                    GvMULTI_on(gv);
-                   hv_magic(hv, Nullgv, PERL_MAGIC_overload);
+                   hv_magic(hv, NULL, PERL_MAGIC_overload);
                }
                break;
            case 'S':
@@ -1027,7 +1027,7 @@ Perl_gv_fetchpvn_flags(pTHX_ const char *nambeg, STRLEN full_len, I32 flags,
                    }
                    GvMULTI_on(gv);
                    hv = GvHVn(gv);
-                   hv_magic(hv, Nullgv, PERL_MAGIC_sig);
+                   hv_magic(hv, NULL, PERL_MAGIC_sig);
                    for (i = 1; i < SIG_SIZE; i++) {
                        SV * const * const init = hv_fetch(hv, PL_sig_name[i], strlen(PL_sig_name[i]), 1);
                        if (init)
@@ -1133,7 +1133,7 @@ Perl_gv_fetchpvn_flags(pTHX_ const char *nambeg, STRLEN full_len, I32 flags,
        case '-':
        {
            AV* const av = GvAVn(gv);
-            sv_magic((SV*)av, Nullsv, PERL_MAGIC_regdata, NULL, 0);
+            sv_magic((SV*)av, NULL, PERL_MAGIC_regdata, NULL, 0);
            SvREADONLY_on(av);
            goto magicalize;
        }