Change 33161 by [EMAIL PROTECTED] on 2008/01/31 22:14:13
Integrate:
[ 33051]
Deprecate (and remove core use of ) Nullav, Nullcv, Nullgv, Nullhe,
Nullhek and Nullhv. Nullop is going to be a bit less simple.
[ 33052]
Purge all use of Nullch in non-dual life modules.
Exterminate! Exterminate! Exterminate!
[ 33053]
Change 33052 missed one Nullch. Oops.
Exterminate! Exterminate! Exterminate!
[for maint, the "remove core use of" part, not the deprecating]
Affected files ...
... //depot/maint-5.10/perl/epoc/epoc.c#2 integrate
... //depot/maint-5.10/perl/ext/B/B.xs#5 integrate
... //depot/maint-5.10/perl/ext/Data/Dumper/Dumper.xs#2 integrate
... //depot/maint-5.10/perl/ext/DynaLoader/dl_symbian.xs#2 integrate
... //depot/maint-5.10/perl/ext/Opcode/Opcode.xs#2 integrate
... //depot/maint-5.10/perl/ext/PerlIO/encoding/encoding.xs#2 integrate
... //depot/maint-5.10/perl/ext/PerlIO/scalar/scalar.xs#2 integrate
... //depot/maint-5.10/perl/ext/PerlIO/via/via.xs#2 integrate
... //depot/maint-5.10/perl/ext/Storable/Storable.xs#3 integrate
... //depot/maint-5.10/perl/malloc.c#2 integrate
... //depot/maint-5.10/perl/pod/perlapio.pod#2 integrate
... //depot/maint-5.10/perl/win32/vdir.h#2 integrate
Differences ...
==== //depot/maint-5.10/perl/epoc/epoc.c#2 (text) ====
Index: perl/epoc/epoc.c
--- perl/epoc/epoc.c#1~32694~ 2007-12-22 01:23:09.000000000 -0800
+++ perl/epoc/epoc.c 2008-01-31 14:14:13.000000000 -0800
@@ -85,7 +85,7 @@
}
/*
- * If ptr != Nullch
+ * If ptr != NULL
* then it worked, set PV valid,
* else return 'undef'
*/
==== //depot/maint-5.10/perl/ext/B/B.xs#5 (text) ====
Index: perl/ext/B/B.xs
--- perl/ext/B/B.xs#4~33130~ 2008-01-30 09:34:11.000000000 -0800
+++ perl/ext/B/B.xs 2008-01-31 14:14:13.000000000 -0800
@@ -1142,7 +1142,7 @@
#define PADOP_sv(o) (o->op_padix ? PAD_SVl(o->op_padix) : Nullsv)
#define PADOP_gv(o) ((o->op_padix \
&& SvTYPE(PAD_SVl(o->op_padix)) == SVt_PVGV) \
- ? (GV*)PAD_SVl(o->op_padix) : Nullgv)
+ ? (GV*)PAD_SVl(o->op_padix) : (GV *)NULL)
MODULE = B PACKAGE = B::PADOP PREFIX = PADOP_
==== //depot/maint-5.10/perl/ext/Data/Dumper/Dumper.xs#2 (text) ====
Index: perl/ext/Data/Dumper/Dumper.xs
--- perl/ext/Data/Dumper/Dumper.xs#1~32694~ 2007-12-22 01:23:09.000000000
-0800
+++ perl/ext/Data/Dumper/Dumper.xs 2008-01-31 14:14:13.000000000 -0800
@@ -317,7 +317,7 @@
if (SvOBJECT(ival))
realpack = HvNAME_get(SvSTASH(ival));
else
- realpack = Nullch;
+ realpack = NULL;
/* if it has a name, we need to either look it up, or keep a tab
* on it so we know when we hit it later
==== //depot/maint-5.10/perl/ext/DynaLoader/dl_symbian.xs#2 (text) ====
Index: perl/ext/DynaLoader/dl_symbian.xs
--- perl/ext/DynaLoader/dl_symbian.xs#1~32694~ 2007-12-22 01:23:09.000000000
-0800
+++ perl/ext/DynaLoader/dl_symbian.xs 2008-01-31 14:14:13.000000000 -0800
@@ -78,7 +78,7 @@
h = new PerlSymbianLibHandle;
if (h) {
h->error = KErrNone;
- h->symbols = Nullhv;
+ h->symbols = (HV *)NULL;
} else
error = KErrNoMemory;
}
==== //depot/maint-5.10/perl/ext/Opcode/Opcode.xs#2 (text) ====
Index: perl/ext/Opcode/Opcode.xs
--- perl/ext/Opcode/Opcode.xs#1~32694~ 2007-12-22 01:23:09.000000000 -0800
+++ perl/ext/Opcode/Opcode.xs 2008-01-31 14:14:13.000000000 -0800
@@ -145,7 +145,7 @@
static int
verify_opset(pTHX_ SV *opset, int fatal)
{
- const char *err = Nullch;
+ const char *err = NULL;
dMY_CXT;
if (!SvOK(opset)) err = "undefined";
==== //depot/maint-5.10/perl/ext/PerlIO/encoding/encoding.xs#2 (text) ====
Index: perl/ext/PerlIO/encoding/encoding.xs
--- perl/ext/PerlIO/encoding/encoding.xs#1~32694~ 2007-12-22
01:23:09.000000000 -0800
+++ perl/ext/PerlIO/encoding/encoding.xs 2008-01-31 14:14:13.000000000
-0800
@@ -257,9 +257,9 @@
STDCHAR *ptr = PerlIO_get_ptr(n);
SSize_t use = (avail >= 0) ? avail : 0;
SV *uni;
- char *s = Nullch;
+ char *s = NULL;
STRLEN len = 0;
- e->base.ptr = e->base.end = (STDCHAR *) Nullch;
+ e->base.ptr = e->base.end = (STDCHAR *) NULL;
(void) PerlIOEncode_get_base(aTHX_ f);
if (!e->dataSV)
e->dataSV = newSV(0);
==== //depot/maint-5.10/perl/ext/PerlIO/scalar/scalar.xs#2 (text) ====
Index: perl/ext/PerlIO/scalar/scalar.xs
--- perl/ext/PerlIO/scalar/scalar.xs#1~32694~ 2007-12-22 01:23:09.000000000
-0800
+++ perl/ext/PerlIO/scalar/scalar.xs 2008-01-31 14:14:13.000000000 -0800
@@ -184,7 +184,7 @@
if (PerlIOBase(f)->flags & PERLIO_F_CANREAD) {
return (STDCHAR *) SvPV_nolen(s->var);
}
- return (STDCHAR *) Nullch;
+ return (STDCHAR *) NULL;
}
STDCHAR *
@@ -194,7 +194,7 @@
PerlIOScalar *s = PerlIOSelf(f, PerlIOScalar);
return PerlIOScalar_get_base(aTHX_ f) + s->posn;
}
- return (STDCHAR *) Nullch;
+ return (STDCHAR *) NULL;
}
SSize_t
==== //depot/maint-5.10/perl/ext/PerlIO/via/via.xs#2 (text) ====
Index: perl/ext/PerlIO/via/via.xs
--- perl/ext/PerlIO/via/via.xs#1~32694~ 2007-12-22 01:23:09.000000000 -0800
+++ perl/ext/PerlIO/via/via.xs 2008-01-31 14:14:13.000000000 -0800
@@ -489,7 +489,7 @@
return (STDCHAR *) SvPVX(s->var);
}
}
- return (STDCHAR *) Nullch;
+ return (STDCHAR *) NULL;
}
STDCHAR *
@@ -502,7 +502,7 @@
return p;
}
}
- return (STDCHAR *) Nullch;
+ return (STDCHAR *) NULL;
}
SSize_t
==== //depot/maint-5.10/perl/ext/Storable/Storable.xs#3 (text) ====
Index: perl/ext/Storable/Storable.xs
--- perl/ext/Storable/Storable.xs#2~33126~ 2008-01-30 07:26:23.000000000
-0800
+++ perl/ext/Storable/Storable.xs 2008-01-31 14:14:13.000000000 -0800
@@ -4450,7 +4450,7 @@
* into the existing design. -- RAM, 17/02/2001
*/
- sv_magic(sv, rv, mtype, Nullch, 0);
+ sv_magic(sv, rv, mtype, (char *)NULL, 0);
SvREFCNT_dec(rv); /* Undo refcnt inc from
sv_magic() */
return sv;
@@ -4647,7 +4647,7 @@
sv_upgrade(tv, SVt_PVAV);
AvREAL_off((AV *)tv);
- sv_magic(tv, sv, 'P', Nullch, 0);
+ sv_magic(tv, sv, 'P', (char *)NULL, 0);
SvREFCNT_dec(sv); /* Undo refcnt inc from
sv_magic() */
TRACEME(("ok (retrieve_tied_array at 0x%"UVxf")", PTR2UV(tv)));
@@ -4675,7 +4675,7 @@
return (SV *) 0; /* Failed */
sv_upgrade(tv, SVt_PVHV);
- sv_magic(tv, sv, 'P', Nullch, 0);
+ sv_magic(tv, sv, 'P', (char *)NULL, 0);
SvREFCNT_dec(sv); /* Undo refcnt inc from
sv_magic() */
TRACEME(("ok (retrieve_tied_hash at 0x%"UVxf")", PTR2UV(tv)));
@@ -4707,7 +4707,7 @@
}
sv_upgrade(tv, SVt_PVMG);
- sv_magic(tv, obj, 'q', Nullch, 0);
+ sv_magic(tv, obj, 'q', (char *)NULL, 0);
if (obj) {
/* Undo refcnt inc from sv_magic() */
@@ -4774,7 +4774,7 @@
RLEN(idx); /* Retrieve <idx> */
sv_upgrade(tv, SVt_PVMG);
- sv_magic(tv, sv, 'p', Nullch, idx);
+ sv_magic(tv, sv, 'p', (char *)NULL, idx);
SvREFCNT_dec(sv); /* Undo refcnt inc from
sv_magic() */
return tv;
==== //depot/maint-5.10/perl/malloc.c#2 (text) ====
Index: perl/malloc.c
--- perl/malloc.c#1~32694~ 2007-12-22 01:23:09.000000000 -0800
+++ perl/malloc.c 2008-01-31 14:14:13.000000000 -0800
@@ -379,9 +379,6 @@
# ifndef UVxf
# define UVxf "lx"
# endif
-# ifndef Nullch
-# define Nullch NULL
-# endif
# ifndef MEM_ALIGNBYTES
# define MEM_ALIGNBYTES 4
# endif
==== //depot/maint-5.10/perl/pod/perlapio.pod#2 (text) ====
Index: perl/pod/perlapio.pod
--- perl/pod/perlapio.pod#1~32694~ 2007-12-22 01:23:09.000000000 -0800
+++ perl/pod/perlapio.pod 2008-01-31 14:14:13.000000000 -0800
@@ -486,7 +486,7 @@
Portable cases are:
- PerlIO_binmode(f,ptype,O_BINARY,Nullch);
+ PerlIO_binmode(f,ptype,O_BINARY,NULL);
and
PerlIO_binmode(f,ptype,O_TEXT,":crlf");
==== //depot/maint-5.10/perl/win32/vdir.h#2 (text) ====
Index: perl/win32/vdir.h
--- perl/win32/vdir.h#1~32694~ 2007-12-22 01:23:09.000000000 -0800
+++ perl/win32/vdir.h 2008-01-31 14:14:13.000000000 -0800
@@ -316,7 +316,7 @@
/*
* On WinNT GetFullPathName does not fail, (or at least always
- * succeeds when the drive is valid) WinNT does set *Dest to Nullch
+ * succeeds when the drive is valid) WinNT does set *Dest to NULL
* On Win98 GetFullPathName will set last error if it fails, but
* does not touch *Dest
*/
@@ -544,7 +544,7 @@
/*
* On WinNT GetFullPathName does not fail, (or at least always
- * succeeds when the drive is valid) WinNT does set *Dest to Nullch
+ * succeeds when the drive is valid) WinNT does set *Dest to NULL
* On Win98 GetFullPathName will set last error if it fails, but
* does not touch *Dest
*/
End of Patch.
