Change 33121 by [EMAIL PROTECTED] on 2008/01/30 11:03:49
Integrate:
[ 32712]
Subject: [PATCH] Fix cygwin.c again
From: "Jerry D. Hedden" <[EMAIL PROTECTED]>
Date: Sat, 22 Dec 2007 16:11:48 -0500
Message-ID: <[EMAIL PROTECTED]>
Fixes breakage caused by change #32707
[ 32713]
Nullch and others were still alive and well in some of the operating
system specific directories. I think I've chainsawed all of them now,
but I can't guarantee that it compiles anywhere from win32.
[ 32721]
Subject: [PATCH] Remove Nullch etc. from x2p
From: "Jan Dubois" <[EMAIL PROTECTED]>
Date: Mon, 24 Dec 2007 14:58:20 -0800
Message-ID: <[EMAIL PROTECTED]>
[ 32723]
Subject: patch - chg 32721 missed a couple Nullstrs
From: jimc <[EMAIL PROTECTED]>
Date: Tue, 25 Dec 2007 05:39:30 -0700
Message-ID: <[EMAIL PROTECTED]>
[ 32739]
Remove the last Null(...) from x2p/*
Something tells me that Win32 is compiling x2p with -DPERL_CORE
*nix dosn't do this.
Affected files ...
... //depot/maint-5.10/perl/NetWare/nw5.c#2 integrate
... //depot/maint-5.10/perl/NetWare/nwperlhost.h#2 integrate
... //depot/maint-5.10/perl/NetWare/nwperlsys.h#2 integrate
... //depot/maint-5.10/perl/NetWare/nwstdio.h#2 integrate
... //depot/maint-5.10/perl/cygwin/cygwin.c#3 integrate
... //depot/maint-5.10/perl/djgpp/djgpp.c#2 integrate
... //depot/maint-5.10/perl/os2/OS2/REXX/REXX.xs#2 integrate
... //depot/maint-5.10/perl/os2/os2.c#3 integrate
... //depot/maint-5.10/perl/util.c#2 integrate
... //depot/maint-5.10/perl/vmesa/vmesa.c#2 integrate
... //depot/maint-5.10/perl/vms/ext/Stdio/Stdio.xs#2 integrate
... //depot/maint-5.10/perl/vms/vms.c#3 integrate
... //depot/maint-5.10/perl/win32/perlhost.h#2 integrate
... //depot/maint-5.10/perl/win32/win32.c#2 integrate
... //depot/maint-5.10/perl/win32/wince.c#2 integrate
... //depot/maint-5.10/perl/x2p/a2p.h#3 integrate
... //depot/maint-5.10/perl/x2p/a2py.c#3 integrate
... //depot/maint-5.10/perl/x2p/hash.c#2 integrate
... //depot/maint-5.10/perl/x2p/str.c#3 integrate
... //depot/maint-5.10/perl/x2p/str.h#3 integrate
... //depot/maint-5.10/perl/x2p/util.c#3 integrate
... //depot/maint-5.10/perl/x2p/walk.c#3 integrate
Differences ...
==== //depot/maint-5.10/perl/NetWare/nw5.c#2 (text) ====
Index: perl/NetWare/nw5.c
--- perl/NetWare/nw5.c#1~32694~ 2007-12-22 01:23:09.000000000 -0800
+++ perl/NetWare/nw5.c 2008-01-30 03:03:49.000000000 -0800
@@ -318,7 +318,7 @@
return des_fcrypt(txt, salt, w32_crypt_buffer);
#else
Perl_croak(aTHX_ "The crypt() function is not implemented on NetWare\n");
- return Nullch;
+ return NULL;
#endif
}
@@ -1001,7 +1001,7 @@
if (*s)
*s++ = '\0';
}
- *a = Nullch;
+ *a = NULL;
if (argv[0]) {
switch (exectype) {
case EXECF_SPAWN:
@@ -1031,7 +1031,7 @@
while (++i < nw_perlshell_items)
argv[i] = nw_perlshell_vec[i];
argv[i++] = cmd;
- argv[i] = Nullch;
+ argv[i] = NULL;
switch (exectype) {
case EXECF_SPAWN:
status = nw_spawnvp(P_WAIT, argv[0], (char **)argv);
==== //depot/maint-5.10/perl/NetWare/nwperlhost.h#2 (text) ====
Index: perl/NetWare/nwperlhost.h
--- perl/NetWare/nwperlhost.h#1~32694~ 2007-12-22 01:23:09.000000000 -0800
+++ perl/NetWare/nwperlhost.h 2008-01-30 03:03:49.000000000 -0800
@@ -448,7 +448,7 @@
FILE *f = (FILE*)pf;
return FILE_base(f);
#else
- return Nullch;
+ return NULL;
#endif
}
@@ -481,7 +481,7 @@
FILE *f = (FILE*)pf;
return FILE_ptr(f);
#else
- return Nullch;
+ return NULL;
#endif
}
==== //depot/maint-5.10/perl/NetWare/nwperlsys.h#2 (text) ====
Index: perl/NetWare/nwperlsys.h
--- perl/NetWare/nwperlsys.h#1~32694~ 2007-12-22 01:23:09.000000000 -0800
+++ perl/NetWare/nwperlsys.h 2008-01-30 03:03:49.000000000 -0800
@@ -342,7 +342,7 @@
FILE *f = pf;
return FILE_base(f);
#else
- return Nullch;
+ return NULL;
#endif
}
@@ -375,7 +375,7 @@
FILE *f = pf;
return FILE_ptr(f);
#else
- return Nullch;
+ return NULL;
#endif
}
==== //depot/maint-5.10/perl/NetWare/nwstdio.h#2 (text) ====
Index: perl/NetWare/nwstdio.h
--- perl/NetWare/nwstdio.h#1~32694~ 2007-12-22 01:23:09.000000000 -0800
+++ perl/NetWare/nwstdio.h 2008-01-30 03:03:49.000000000 -0800
@@ -52,7 +52,7 @@
#ifdef HAS_SETLINEBUF
#define PerlIO_setlinebuf(f) (*PL_StdIO->pSetlinebuf)(PL_StdIO, (f))
#else
-#define PerlIO_setlinebuf(f) setvbuf(f, Nullch, _IOLBF, 0)
+#define PerlIO_setlinebuf(f) setvbuf(f, NULL, _IOLBF, 0)
#endif
#define PerlIO_isutf8(f) 0
==== //depot/maint-5.10/perl/cygwin/cygwin.c#3 (text) ====
Index: perl/cygwin/cygwin.c
--- perl/cygwin/cygwin.c#2~33119~ 2008-01-30 02:06:52.000000000 -0800
+++ perl/cygwin/cygwin.c 2008-01-30 03:03:49.000000000 -0800
@@ -63,7 +63,7 @@
*a++ = SvPVx((SV *)*mark, n_a);
else
*a++ = "";
- *a = Nullch;
+ *a = (char*)NULL;
if (argv[0][0] != '/' && argv[0][0] != '\\'
&& !(argv[0][0] && argv[0][1] == ':'
@@ -133,7 +133,7 @@
if (*s)
*s++='\0';
}
- *a=Nullch;
+ *a = (char*)NULL;
if (!PL_Argv[0])
return -1;
==== //depot/maint-5.10/perl/djgpp/djgpp.c#2 (text) ====
Index: perl/djgpp/djgpp.c
--- perl/djgpp/djgpp.c#1~32694~ 2007-12-22 01:23:09.000000000 -0800
+++ perl/djgpp/djgpp.c 2008-01-30 03:03:49.000000000 -0800
@@ -129,7 +129,7 @@
*a++ = SvPVx(*mark, n_a);
else
*a++ = "";
- *a = Nullch;
+ *a = NULL;
if (argv[0][0] != '/' && argv[0][0] != '\\'
&& !(argv[0][0] && argv[0][1] == ':'
@@ -204,7 +204,7 @@
if (*s)
*s++='\0';
}
- *a=Nullch;
+ *a=NULL;
if (!PL_Argv[0])
return -1;
==== //depot/maint-5.10/perl/os2/OS2/REXX/REXX.xs#2 (text) ====
Index: perl/os2/OS2/REXX/REXX.xs
--- perl/os2/OS2/REXX/REXX.xs#1~32694~ 2007-12-22 01:23:09.000000000 -0800
+++ perl/os2/OS2/REXX/REXX.xs 2008-01-30 03:03:49.000000000 -0800
@@ -223,7 +223,7 @@
static ULONG
PERLCALL(PCSZ name, ULONG argc, PRXSTRING argv, PCSZ queue, PRXSTRING ret)
{
- return PERLCALLcv(name, Nullsv, argc, argv, queue, ret);
+ return PERLCALLcv(name, NULL, argc, argv, queue, ret);
}
RexxFunctionHandler* PF = &PERLSTART;
@@ -556,7 +556,7 @@
Newx(names, n, char*);
Newx(cvs, n, SV*);
/* XXX Unfinished... */
- RETVAL = Nullsv;
+ RETVAL = NULL;
Safefree(names);
Safefree(cvs);
}
==== //depot/maint-5.10/perl/os2/os2.c#3 (text) ====
Index: perl/os2/os2.c
--- perl/os2/os2.c#2~33120~ 2008-01-30 02:33:34.000000000 -0800
+++ perl/os2/os2.c 2008-01-30 03:03:49.000000000 -0800
@@ -998,7 +998,7 @@
if (flag == P_WAIT)
flag = P_NOWAIT;
if (really && !*(real_name = SvPV(really, n_a)))
- really = Nullsv;
+ really = NULL;
retry:
if (strEQ(PL_Argv[0],"/bin/sh"))
@@ -1265,7 +1265,7 @@
/* XXXX This is good only until we refuse
quoted arguments... */
PL_Argv[0] = inicmd;
- PL_Argv[1] = Nullch;
+ PL_Argv[1] = NULL;
}
} else if (!buf[0] && inicmd) { /* No file */
/* Start with the original cmdline. */
@@ -1273,7 +1273,7 @@
quoted arguments... */
PL_Argv[0] = inicmd;
- PL_Argv[1] = Nullch;
+ PL_Argv[1] = NULL;
nargs = 2; /* shell -c */
}
@@ -1458,7 +1458,7 @@
if (*s)
*s++ = '\0';
}
- *a = Nullch;
+ *a = NULL;
if (PL_Argv[0])
rc = do_spawn_ve(aTHX_ NULL, flag, execf, cmd, mergestderr);
else
@@ -1500,7 +1500,7 @@
else
*a++ = "";
}
- *a = Nullch;
+ *a = NULL;
if ( flag_set && (a == PL_Argv + 1)
&& !really && execing == ASPAWN_WAIT ) { /* One arg? */
@@ -1573,7 +1573,7 @@
taint_proper("Insecure %s%s", "EXEC");
}
if (pipe(p) < 0)
- return Nullfp;
+ return NULL;
/* Now we need to spawn the child. */
if (p[this] == (*mode == 'r')) { /* if fh 0/1 was initially closed. */
int new = dup(p[this]);
@@ -1592,7 +1592,7 @@
closepipes:
close(p[0]);
close(p[1]);
- return Nullfp;
+ return NULL;
}
} else
fh_fl = fcntl(*mode == 'r', F_GETFD);
@@ -1605,7 +1605,7 @@
if (newfd != -1)
fcntl(newfd, F_SETFD, FD_CLOEXEC);
if (cnt) { /* Args: "Real cmd", before first arg, the last, execing */
- pid = os2_aspawn_4(aTHX_ Nullsv, args, cnt, ASPAWN_NOWAIT);
+ pid = os2_aspawn_4(aTHX_ NULL, args, cnt, ASPAWN_NOWAIT);
} else
pid = do_spawn_nowait(aTHX_ cmd);
if (newfd == -1)
@@ -1620,7 +1620,7 @@
close(p[that]);
if (pid == -1) {
close(p[this]);
- return Nullfp;
+ return NULL;
}
if (p[that] < p[this]) { /* Make fh as small as possible */
dup2(p[this], p[that]);
@@ -1879,8 +1879,8 @@
Perl_croak(aTHX_ "Usage: OS2::replaceModule(target [, source [,
backup]])");
{
char * target = (char *)SvPV_nolen(ST(0));
- char * source = (items < 2) ? Nullch : (char *)SvPV_nolen(ST(1));
- char * backup = (items < 3) ? Nullch : (char *)SvPV_nolen(ST(2));
+ char * source = (items < 2) ? NULL : (char *)SvPV_nolen(ST(1));
+ char * backup = (items < 3) ? NULL : (char *)SvPV_nolen(ST(2));
if (!replaceModule(target, source, backup))
croak_with_os2error("replaceModule() error");
@@ -2159,7 +2159,7 @@
{
char *o;
STRLEN ll;
- SV *dll = Nullsv;
+ SV *dll = NULL;
dll = module_name(mod_name_full);
o = SvPV(dll, ll);
@@ -4099,7 +4099,7 @@
int connect = 0, count, message_r = 0, message = 0, b = 0;
ULONG ulInbufLength, ulOutbufLength, ulPipeMode, ulTimeout, rc;
STRLEN len;
- char *s, buf[10], *s1, *perltype = Nullch;
+ char *s, buf[10], *s1, *perltype = NULL;
PerlIO *perlio;
double timeout;
==== //depot/maint-5.10/perl/util.c#2 (text) ====
Index: perl/util.c
--- perl/util.c#1~32694~ 2007-12-22 01:23:09.000000000 -0800
+++ perl/util.c 2008-01-30 03:03:49.000000000 -0800
@@ -2343,7 +2343,7 @@
return PerlIO_fdopen(p[This], mode);
#else
# ifdef OS2 /* Same, without fork()ing and all extra overhead... */
- return my_syspopen4(aTHX_ Nullch, mode, n, args);
+ return my_syspopen4(aTHX_ NULL, mode, n, args);
# else
Perl_croak(aTHX_ "List form of piped open not implemented");
return (PerlIO *) NULL;
==== //depot/maint-5.10/perl/vmesa/vmesa.c#2 (text) ====
Index: perl/vmesa/vmesa.c
--- perl/vmesa/vmesa.c#1~32694~ 2007-12-22 01:23:09.000000000 -0800
+++ perl/vmesa/vmesa.c 2008-01-30 03:03:49.000000000 -0800
@@ -136,7 +136,7 @@
fdMap[STDOUT_FILENO] = Perl_stdout_fd;
fdMap[STDERR_FILENO] = STDERR_FILENO;
nFd = 3;
- *a = Nullch;
+ *a = NULL;
/*-----------------------------------------------------*/
/* Will execvp() use PATH? */
/*-----------------------------------------------------*/
@@ -272,7 +272,7 @@
if (*s)
*s++ = '\0';
}
- *a = Nullch;
+ *a = NULL;
fdMap[STDIN_FILENO] = Perl_stdin_fd;
fdMap[STDOUT_FILENO] = Perl_stdout_fd;
fdMap[STDERR_FILENO] = STDERR_FILENO;
@@ -421,7 +421,7 @@
close(pFd[that]);
}
else
- fd = Nullfp;
+ fd = NULL;
}
else
{
@@ -434,7 +434,7 @@
}
}
else
- fd = Nullfp;
+ fd = NULL;
return (fd);
}
==== //depot/maint-5.10/perl/vms/ext/Stdio/Stdio.xs#2 (text) ====
Index: perl/vms/ext/Stdio/Stdio.xs
--- perl/vms/ext/Stdio/Stdio.xs#1~32694~ 2007-12-22 01:23:09.000000000
-0800
+++ perl/vms/ext/Stdio/Stdio.xs 2008-01-30 03:03:49.000000000 -0800
@@ -93,10 +93,10 @@
* equivalent to gv_fetchpv("VMS::Stdio::__FH__",TRUE,SVt_PVIO),
* with a little less overhead, and good exercise for me. :-) */
stashp = (GV **)hv_fetch(PL_defstash,"VMS::",5,TRUE);
- if (!stashp || *stashp == (GV *)&PL_sv_undef) return Nullsv;
+ if (!stashp || *stashp == (GV *)&PL_sv_undef) return NULL;
if (!(stash = GvHV(*stashp))) stash = GvHV(*stashp) = newHV();
stashp = (GV **)hv_fetch(GvHV(*stashp),"Stdio::",7,TRUE);
- if (!stashp || *stashp == (GV *)&PL_sv_undef) return Nullsv;
+ if (!stashp || *stashp == (GV *)&PL_sv_undef) return NULL;
if (!(stash = GvHV(*stashp))) stash = GvHV(*stashp) = newHV();
/* Set up GV to point to IO, and then take reference */
@@ -131,14 +131,14 @@
SV *name;
IO *io;
char iotype;
- char filespec[NAM$C_MAXRSS], *acmode, *s, *colon, *dirend = Nullch;
+ char filespec[NAM$C_MAXRSS], *acmode, *s, *colon, *dirend = NULL;
int ret = 0, saverrno = errno, savevmserrno = vaxc$errno;
SV pos;
PerlIO *fp;
io = sv_2io(fh);
fp = io ? IoOFP(io) : NULL;
iotype = io ? IoTYPE(io) : '\0';
- if (fp == NULL || strchr(">was+-|",iotype) == Nullch) {
+ if (fp == NULL || strchr(">was+-|",iotype) == NULL) {
set_errno(EBADF); set_vaxc_errno(SS$_IVCHAN); XSRETURN_UNDEF;
}
if (!PerlIO_getname(fp,filespec)) XSRETURN_UNDEF;
@@ -152,7 +152,7 @@
}
/* If we've got a non-file-structured device, clip off the trailing
* junk, and don't lose sleep if we can't get a stream position. */
- if (dirend == Nullch) *(colon+1) = '\0';
+ if (dirend == NULL) *(colon+1) = '\0';
if (iotype != '-' && (ret = PerlIO_getpos(fp, &pos)) == -1 &&
dirend)
XSRETURN_UNDEF;
switch (iotype) {
@@ -174,7 +174,7 @@
}
/* appearances to the contrary, this is an freopen substitute */
name = sv_2mortal(newSVpvn(filespec,strlen(filespec)));
- if (PerlIO_openn(aTHX_ Nullch,acmode,-1,0,0,fp,1,&name) == Nullfp)
XSRETURN_UNDEF;
+ if (PerlIO_openn(aTHX_ NULL,acmode,-1,0,0,fp,1,&name) == NULL)
XSRETURN_UNDEF;
if (iotype != '-' && ret != -1 && PerlIO_setpos(fp,&pos) == -1)
XSRETURN_UNDEF;
if (ret == -1) { set_errno(saverrno); set_vaxc_errno(savevmserrno);
}
XSRETURN_YES;
@@ -349,7 +349,7 @@
fp =
fopen(spec,mode,args[0],args[1],args[2],args[3],args[4],args[5],args[6],args[7]);
break;
}
- if (fp != Null(FILE*)) {
+ if (!fp) {
pio_fp = PerlIO_fdopen(fileno(fp),mode);
fh = newFH(pio_fp,(mode[1] ? '+' : (mode[0] == 'r' ? '<' :
(mode[0] == 'a' ? 'a' : '>'))));
ST(0) = (fh ? sv_2mortal(fh) : &PL_sv_undef);
@@ -408,7 +408,7 @@
}
i = mode & 3;
if (fd >= 0 &&
- ((pio_fp = PerlIO_fdopen(fd, &("r\000w\000r+"[2*i]))) !=
Null(PerlIO*))) {
+ ((pio_fp = PerlIO_fdopen(fd, &("r\000w\000r+"[2*i]))) != NULL)) {
fh = newFH(pio_fp,"<>++"[i]);
ST(0) = (fh ? sv_2mortal(fh) : &PL_sv_undef);
}
@@ -433,10 +433,10 @@
struct dsc$descriptor devdsc = {0, DSC$K_DTYPE_T, DSC$K_CLASS_S,
devnam};
IO *io = sv_2io(mysv);
PerlIO *fp = io ? IoOFP(io) : NULL;
- if (fp == NULL || strchr(">was+-|",IoTYPE(io)) == Nullch) {
+ if (fp == NULL || strchr(">was+-|",IoTYPE(io)) == NULL) {
set_errno(EBADF); set_vaxc_errno(SS$_IVCHAN); XSRETURN_UNDEF;
}
- if (PerlIO_getname(fp,devnam) == Nullch) { ST(0) = &PL_sv_undef;
XSRETURN(1); }
+ if (PerlIO_getname(fp,devnam) == NULL) { ST(0) = &PL_sv_undef;
XSRETURN(1); }
if ((cp = strrchr(devnam,':')) != NULL) *(cp+1) = '\0';
devdsc.dsc$w_length = strlen(devnam);
retsts = sys$assign(&devdsc,&chan,0,0);
==== //depot/maint-5.10/perl/vms/vms.c#3 (text) ====
Index: perl/vms/vms.c
--- perl/vms/vms.c#2~33120~ 2008-01-30 02:33:34.000000000 -0800
+++ perl/vms/vms.c 2008-01-30 03:03:49.000000000 -0800
@@ -1178,7 +1178,7 @@
* for an optional name, and this "error" often shows up as the
* (bogus) exit status for a die() call later on. */
if (sys && vaxc$errno == SS$_NOLOGNAM) SETERRNO(saverr,savvmserr);
- return success ? eqv : Nullch;
+ return success ? eqv : NULL;
}
} /* end of my_getenv() */
@@ -1284,7 +1284,7 @@
* for an optional name, and this "error" often shows up as the
* (bogus) exit status for a die() call later on. */
if (sys && vaxc$errno == SS$_NOLOGNAM) SETERRNO(saverr,savvmserr);
- return *len ? buf : Nullch;
+ return *len ? buf : NULL;
}
} /* end of my_getenv_len() */
@@ -1304,7 +1304,7 @@
static int primed = 0;
HV *seenhv = NULL, *envhv;
SV *sv = NULL;
- char cmd[LNM$C_NAMLENGTH+24], mbxnam[LNM$C_NAMLENGTH], *buf = Nullch;
+ char cmd[LNM$C_NAMLENGTH+24], mbxnam[LNM$C_NAMLENGTH], *buf = NULL;
unsigned short int chan;
#ifndef CLI$M_TRUSTED
# define CLI$M_TRUSTED 0x40 /* Missing from VAXC headers */
@@ -3599,7 +3599,7 @@
temp[1] = '\0';
}
- if ((tounixpath_utf8(temp, unixdir, NULL)) != Nullch) {
+ if ((tounixpath_utf8(temp, unixdir, NULL)) != NULL) {
p = (pPLOC) PerlMem_malloc(sizeof(PLOC));
if (p == NULL) _ckvmssts(SS$_INSFMEM);
p->next = head_PLOC;
@@ -3622,7 +3622,7 @@
if (SvROK(dirsv)) continue;
dir = SvPVx(dirsv,n_a);
if (strcmp(dir,".") == 0) continue;
- if ((tounixpath_utf8(dir, unixdir, NULL)) == Nullch)
+ if ((tounixpath_utf8(dir, unixdir, NULL)) == NULL)
continue;
p = (pPLOC) PerlMem_malloc(sizeof(PLOC));
@@ -3635,7 +3635,7 @@
/* most likely spot (ARCHLIB) put first in the list */
#ifdef ARCHLIB_EXP
- if ((tounixpath_utf8(ARCHLIB_EXP, unixdir, NULL)) != Nullch) {
+ if ((tounixpath_utf8(ARCHLIB_EXP, unixdir, NULL)) != NULL) {
p = (pPLOC) PerlMem_malloc(sizeof(PLOC));
if (p == NULL) _ckvmssts(SS$_INSFMEM);
p->next = head_PLOC;
@@ -4013,7 +4013,7 @@
info->in = 0;
info->out = 0;
info->err = 0;
- info->fp = Nullfp;
+ info->fp = NULL;
info->useFILE = 0;
info->waiting = 0;
info->in_done = TRUE;
@@ -4098,7 +4098,7 @@
PerlIO * xterm_fd;
xterm_fd = create_forked_xterm(aTHX_ cmd, in_mode);
- if (xterm_fd != Nullfp)
+ if (xterm_fd != NULL)
return xterm_fd;
}
@@ -4142,7 +4142,7 @@
if (ckWARN(WARN_PIPE)) {
Perl_warner(aTHX_ packWARN(WARN_PIPE),"unable to find
VMSPIPE.COM for i/o piping");
}
- return Nullfp;
+ return NULL;
}
fgetname(tpipe,tfilebuf+1,1);
}
@@ -4174,7 +4174,7 @@
Perl_warner(aTHX_ packWARN(WARN_PIPE),"Can't pipe \"%*s\": %s",
strlen(cmd), cmd, Strerror(errno));
}
*psts = sts;
- return Nullfp;
+ return NULL;
}
n = sizeof(Info);
_ckvmssts(lib$get_vm(&n, &info));
@@ -4187,7 +4187,7 @@
info->in = 0;
info->out = 0;
info->err = 0;
- info->fp = Nullfp;
+ info->fp = NULL;
info->useFILE = 0;
info->waiting = 0;
info->in_done = TRUE;
@@ -4250,7 +4250,7 @@
n = sizeof(Info);
_ckvmssts(lib$free_vm(&n, &info));
*psts = RMS$_FNF;
- return Nullfp;
+ return NULL;
}
info->err = pipe_mbxtofd_setup(aTHX_ fileno(stderr), err);
@@ -4314,7 +4314,7 @@
n = sizeof(Info);
_ckvmssts(lib$free_vm(&n, &info));
*psts = RMS$_FNF;
- return Nullfp;
+ return NULL;
}
@@ -8903,7 +8903,7 @@
*p = '\0';
fp = safe_popen(aTHX_ subcmd,"wbF",&sts);
- if (fp == Nullfp) {
+ if (fp == NULL) {
PerlIO_printf(Perl_debug_log,"Can't open output pipe (status %d)",sts);
}
}
@@ -9788,7 +9788,7 @@
static char *
setup_argstr(pTHX_ SV *really, SV **mark, SV **sp)
{
- char *junk, *tmps = Nullch;
+ char *junk, *tmps = NULL;
register size_t cmdlen = 0;
size_t rlen;
register SV **idx;
==== //depot/maint-5.10/perl/win32/perlhost.h#2 (text) ====
Index: perl/win32/perlhost.h
--- perl/win32/perlhost.h#1~32694~ 2007-12-22 01:23:09.000000000 -0800
+++ perl/win32/perlhost.h 2008-01-30 03:03:49.000000000 -0800
@@ -623,7 +623,7 @@
FILE *f = pf;
return FILE_base(f);
#else
- return Nullch;
+ return NULL;
#endif
}
@@ -656,7 +656,7 @@
FILE *f = pf;
return FILE_ptr(f);
#else
- return Nullch;
+ return NULL;
#endif
}
==== //depot/maint-5.10/perl/win32/win32.c#2 (text) ====
Index: perl/win32/win32.c
--- perl/win32/win32.c#1~32694~ 2007-12-22 01:23:09.000000000 -0800
+++ perl/win32/win32.c 2008-01-30 03:03:49.000000000 -0800
@@ -268,7 +268,7 @@
HKEY handle;
DWORD type;
const char *subkey = "Software\\Perl";
- char *str = Nullch;
+ char *str = NULL;
long retval;
retval = RegOpenKeyEx(hkey, subkey, 0, KEY_READ, &handle);
@@ -366,7 +366,7 @@
return SvPVX(*prev_pathp);
}
- return Nullch;
+ return NULL;
}
char *
@@ -375,7 +375,7 @@
dTHX;
char *stdlib = "lib";
char buffer[MAX_PATH+1];
- SV *sv = Nullsv;
+ SV *sv = NULL;
/* $stdlib = $HKCU{"lib-$]"} || $HKLM{"lib-$]"} || $HKCU{"lib"} ||
$HKLM{"lib"} || ""; */
sprintf(buffer, "%s-%s", stdlib, pl);
@@ -383,7 +383,7 @@
(void)get_regstr(stdlib, &sv);
/* $stdlib .= ";$EMD/../../lib" */
- return get_emd_part(&sv, stdlib, ARCHNAME, "bin", Nullch);
+ return get_emd_part(&sv, stdlib, ARCHNAME, "bin", NULL);
}
static char *
@@ -392,8 +392,8 @@
dTHX;
char regstr[40];
char pathstr[MAX_PATH+1];
- SV *sv1 = Nullsv;
- SV *sv2 = Nullsv;
+ SV *sv1 = NULL;
+ SV *sv2 = NULL;
/* $HKCU{"$xlib-$]"} || $HKLM{"$xlib-$]"} . ---; */
sprintf(regstr, "%s-%s", xlib, pl);
@@ -402,7 +402,7 @@
/* $xlib .=
* ";$EMD/" . ((-d $EMD/../../../$]) ? "../../.." : "../..").
"/$libname/$]/lib"; */
sprintf(pathstr, "%s/%s/lib", libname, pl);
- (void)get_emd_part(&sv1, pathstr, ARCHNAME, "bin", pl, Nullch);
+ (void)get_emd_part(&sv1, pathstr, ARCHNAME, "bin", pl, NULL);
/* $HKCU{$xlib} || $HKLM{$xlib} . ---; */
(void)get_regstr(xlib, &sv2);
@@ -410,10 +410,10 @@
/* $xlib .=
* ";$EMD/" . ((-d $EMD/../../../$]) ? "../../.." : "../..").
"/$libname/lib"; */
sprintf(pathstr, "%s/lib", libname);
- (void)get_emd_part(&sv2, pathstr, ARCHNAME, "bin", pl, Nullch);
+ (void)get_emd_part(&sv2, pathstr, ARCHNAME, "bin", pl, NULL);
if (!sv1 && !sv2)
- return Nullch;
+ return NULL;
if (!sv1)
return SvPVX(sv2);
if (!sv2)
@@ -549,7 +549,7 @@
static long
tokenize(const char *str, char **dest, char ***destv)
{
- char *retstart = Nullch;
+ char *retstart = NULL;
char **retvstart = 0;
int items = -1;
if (str) {
@@ -584,7 +584,7 @@
++items;
ret++;
}
- retvstart[items] = Nullch;
+ retvstart[items] = NULL;
*ret++ = '\0';
*ret = '\0';
}
@@ -728,7 +728,7 @@
if (*s)
*s++ = '\0';
}
- *a = Nullch;
+ *a = NULL;
if (argv[0]) {
switch (exectype) {
case EXECF_SPAWN:
@@ -757,7 +757,7 @@
while (++i < w32_perlshell_items)
argv[i] = w32_perlshell_vec[i];
argv[i++] = (char *)cmd;
- argv[i] = Nullch;
+ argv[i] = NULL;
switch (exectype) {
case EXECF_SPAWN:
status = win32_spawnvp(P_WAIT, argv[0],
@@ -1550,7 +1550,7 @@
char *start = path;
char sep;
if (!path)
- return Nullch;
+ return NULL;
/* drive prefix */
if (isALPHA(path[0]) && path[1] == ':') {
@@ -1614,14 +1614,14 @@
else {
FindClose(fhand);
errno = ERANGE;
- return Nullch;
+ return NULL;
}
}
else {
/* failed a step, just return without side effects */
/*PerlIO_printf(Perl_debug_log, "Failed to find %s\n", path);*/
errno = EINVAL;
- return Nullch;
+ return NULL;
}
}
strcpy(path,tmpbuf);
@@ -1698,7 +1698,7 @@
{
dTHX;
DWORD needlen;
- SV *curitem = Nullsv;
+ SV *curitem = NULL;
needlen = GetEnvironmentVariableA(name,NULL,0);
if (needlen != 0) {
@@ -1719,7 +1719,7 @@
if (curitem && SvCUR(curitem))
return SvPVX(curitem);
- return Nullch;
+ return NULL;
}
DllExport int
@@ -2390,7 +2390,7 @@
return des_fcrypt(txt, salt, w32_crypt_buffer);
#else
Perl_croak(aTHX_ "The crypt() function is unimplemented due to excessive
paranoia.");
- return Nullch;
+ return NULL;
#endif
}
@@ -3269,7 +3269,7 @@
int retval = 0;
char szTmpName[MAX_PATH+1];
char dname[MAX_PATH+1];
- char *endname = Nullch;
+ char *endname = NULL;
STRLEN tmplen = 0;
DWORD from_attr, to_attr;
@@ -3328,7 +3328,7 @@
retval = rename(szOldName, szNewName);
/* if we created a temporary file before ... */
- if (endname != Nullch) {
+ if (endname != NULL) {
/* ...and rename succeeded, delete temporary file/directory */
if (retval == 0)
DeleteFile(szTmpName);
@@ -3910,7 +3910,7 @@
int has_slash = 0;
if (!cmd)
- return Nullch;
+ return NULL;
fullcmd = (char*)cmd;
while (*fullcmd) {
if (*fullcmd == '/' || *fullcmd == '\\')
@@ -3984,7 +3984,7 @@
}
Safefree(fullcmd);
- return Nullch;
+ return NULL;
}
/* The following are just place holders.
@@ -4071,7 +4071,7 @@
PROCESS_INFORMATION ProcessInformation;
DWORD create = 0;
char *cmd;
- char *fullcmd = Nullch;
+ char *fullcmd = NULL;
char *cname = (char *)cmdname;
STRLEN clen = 0;
@@ -4886,7 +4886,7 @@
{
int i;
- w32_perlshell_tokens = Nullch;
+ w32_perlshell_tokens = NULL;
w32_perlshell_vec = (char**)NULL;
w32_perlshell_items = 0;
w32_fdpid = newAV();
@@ -4956,7 +4956,7 @@
void
Perl_sys_intern_dup(pTHX_ struct interp_intern *src, struct interp_intern *dst)
{
- dst->perlshell_tokens = Nullch;
+ dst->perlshell_tokens = NULL;
dst->perlshell_vec = (char**)NULL;
dst->perlshell_items = 0;
dst->fdpid = newAV();
==== //depot/maint-5.10/perl/win32/wince.c#2 (text) ====
Index: perl/win32/wince.c
--- perl/win32/wince.c#1~32694~ 2007-12-22 01:23:09.000000000 -0800
+++ perl/win32/wince.c 2008-01-30 03:03:49.000000000 -0800
@@ -135,7 +135,7 @@
HKEY handle;
DWORD type;
const char *subkey = "Software\\Perl";
- char *str = Nullch;
+ char *str = NULL;
long retval;
retval = XCERegOpenKeyExA(hkey, subkey, 0, KEY_READ, &handle);
@@ -231,7 +231,7 @@
return SvPVX(*prev_pathp);
}
- return Nullch;
+ return NULL;
}
char *
@@ -240,7 +240,7 @@
dTHX;
char *stdlib = "lib";
char buffer[MAX_PATH+1];
- SV *sv = Nullsv;
+ SV *sv = NULL;
/* $stdlib = $HKCU{"lib-$]"} || $HKLM{"lib-$]"} || $HKCU{"lib"} ||
$HKLM{"lib"} || ""; */
sprintf(buffer, "%s-%s", stdlib, pl);
@@ -248,7 +248,7 @@
(void)get_regstr(stdlib, &sv);
/* $stdlib .= ";$EMD/../../lib" */
- return get_emd_part(&sv, stdlib, ARCHNAME, "bin", Nullch);
+ return get_emd_part(&sv, stdlib, ARCHNAME, "bin", NULL);
}
static char *
@@ -259,8 +259,8 @@
char pathstr[MAX_PATH+1];
DWORD datalen;
int len, newsize;
- SV *sv1 = Nullsv;
- SV *sv2 = Nullsv;
+ SV *sv1 = NULL;
+ SV *sv2 = NULL;
/* $HKCU{"$xlib-$]"} || $HKLM{"$xlib-$]"} . ---; */
sprintf(regstr, "%s-%s", xlib, pl);
@@ -269,7 +269,7 @@
/* $xlib .=
* ";$EMD/" . ((-d $EMD/../../../$]) ? "../../.." : "../..").
"/$libname/$]/lib"; */
sprintf(pathstr, "%s/%s/lib", libname, pl);
- (void)get_emd_part(&sv1, pathstr, ARCHNAME, "bin", pl, Nullch);
+ (void)get_emd_part(&sv1, pathstr, ARCHNAME, "bin", pl, NULL);
/* $HKCU{$xlib} || $HKLM{$xlib} . ---; */
(void)get_regstr(xlib, &sv2);
@@ -277,10 +277,10 @@
/* $xlib .=
* ";$EMD/" . ((-d $EMD/../../../$]) ? "../../.." : "../..").
"/$libname/lib"; */
sprintf(pathstr, "%s/lib", libname);
- (void)get_emd_part(&sv2, pathstr, ARCHNAME, "bin", pl, Nullch);
+ (void)get_emd_part(&sv2, pathstr, ARCHNAME, "bin", pl, NULL);
if (!sv1 && !sv2)
- return Nullch;
+ return NULL;
if (!sv1)
return SvPVX(sv2);
if (!sv2)
@@ -406,7 +406,7 @@
static long
tokenize(const char *str, char **dest, char ***destv)
{
- char *retstart = Nullch;
+ char *retstart = NULL;
char **retvstart = 0;
int items = -1;
if (str) {
@@ -441,7 +441,7 @@
++items;
ret++;
}
- retvstart[items] = Nullch;
+ retvstart[items] = NULL;
*ret++ = '\0';
*ret = '\0';
}
@@ -551,7 +551,7 @@
if (*s)
*s++ = '\0';
}
- *a = Nullch;
+ *a = NULL;
if (argv[0]) {
switch (exectype) {
case EXECF_SPAWN:
@@ -580,7 +580,7 @@
while (++i < w32_perlshell_items)
argv[i] = w32_perlshell_vec[i];
argv[i++] = cmd;
- argv[i] = Nullch;
+ argv[i] = NULL;
switch (exectype) {
case EXECF_SPAWN:
status = win32_spawnvp(P_WAIT, argv[0],
@@ -1248,7 +1248,7 @@
return des_fcrypt(txt, salt, w32_crypt_buffer);
#else
Perl_croak(aTHX_ "The crypt() function is unimplemented due to excessive
paranoia.");
- return Nullch;
+ return NULL;
#endif
}
@@ -1814,7 +1814,7 @@
int has_slash = 0;
if (!cmd)
- return Nullch;
+ return NULL;
fullcmd = (char*)cmd;
while (*fullcmd) {
if (*fullcmd == '/' || *fullcmd == '\\')
@@ -1889,7 +1889,7 @@
}
Safefree(fullcmd);
- return Nullch;
+ return NULL;
}
/* The following are just place holders.
@@ -1975,7 +1975,7 @@
PROCESS_INFORMATION ProcessInformation;
DWORD create = 0;
char *cmd;
- char *fullcmd = Nullch;
+ char *fullcmd = NULL;
char *cname = (char *)cmdname;
STRLEN clen = 0;
@@ -2612,7 +2612,7 @@
char *file = __FILE__;
dXSUB_SYS;
- w32_perlshell_tokens = Nullch;
+ w32_perlshell_tokens = NULL;
w32_perlshell_items = -1;
w32_fdpid = newAV(); /* XX needs to be in Perl_win32_init()? */
Newx(w32_children, 1, child_tab);
@@ -2782,7 +2782,7 @@
Perl_sys_intern_init(pTHX)
{
int i;
- w32_perlshell_tokens = Nullch;
+ w32_perlshell_tokens = NULL;
w32_perlshell_vec = (char**)NULL;
w32_perlshell_items = 0;
w32_fdpid = newAV();
@@ -2819,7 +2819,7 @@
void
Perl_sys_intern_dup(pTHX_ struct interp_intern *src, struct interp_intern *dst)
{
- dst->perlshell_tokens = Nullch;
+ dst->perlshell_tokens = NULL;
dst->perlshell_vec = (char**)NULL;
dst->perlshell_items = 0;
dst->fdpid = newAV();
==== //depot/maint-5.10/perl/x2p/a2p.h#3 (text) ====
Index: perl/x2p/a2p.h
--- perl/x2p/a2p.h#2~33119~ 2008-01-30 02:06:52.000000000 -0800
+++ perl/x2p/a2p.h 2008-01-30 03:03:49.000000000 -0800
@@ -157,9 +157,6 @@
# include "../handy.h"
#endif
-#undef Nullfp
-#define Nullfp Null(FILE*)
-
#define Nullop 0
#define OPROG 1
@@ -407,7 +404,7 @@
EXT char buf[2048];
EXT char *bufptr INIT(buf);
-EXT STR *linestr INIT(Nullstr);
+EXT STR *linestr INIT(NULL);
EXT char tokenbuf[2048];
EXT int expectterm INIT(TRUE);
@@ -423,7 +420,7 @@
# endif
#endif
-EXT STR *freestrroot INIT(Nullstr);
+EXT STR *freestrroot INIT(NULL);
EXT STR str_no;
EXT STR str_yes;
@@ -447,7 +444,7 @@
EXT bool nomemok INIT(FALSE);
EXT char const_FS INIT(0);
-EXT char *namelist INIT(Nullch);
+EXT char *namelist INIT(NULL);
EXT char fswitch INIT(0);
EXT bool old_awk INIT(0);
==== //depot/maint-5.10/perl/x2p/a2py.c#3 (text) ====
Index: perl/x2p/a2py.c
--- perl/x2p/a2py.c#2~33119~ 2008-01-30 02:06:52.000000000 -0800
+++ perl/x2p/a2py.c 2008-01-30 03:03:49.000000000 -0800
@@ -117,7 +117,7 @@
/* open script */
- if (argv[0] == Nullch) {
+ if (argv[0] == NULL) {
#if defined(OS2) || defined(WIN32) || defined(NETWARE)
if ( isatty(fileno(stdin)) )
usage();
@@ -132,7 +132,7 @@
rsfp = stdin;
else
rsfp = fopen(argv[0],"r");
- if (rsfp == Nullfp)
+ if (rsfp == NULL)
fatal("Awk script \"%s\" doesn't seem to exist.\n",filename);
/* init tokener */
@@ -253,10 +253,10 @@
if (!rsfp)
RETURN(0);
line++;
- if ((s = str_gets(linestr, rsfp)) == Nullch) {
+ if ((s = str_gets(linestr, rsfp)) == NULL) {
if (rsfp != stdin)
fclose(rsfp);
- rsfp = Nullfp;
+ rsfp = NULL;
s = str_get(linestr);
RETURN(0);
}
==== //depot/maint-5.10/perl/x2p/hash.c#2 (text) ====
Index: perl/x2p/hash.c
--- perl/x2p/hash.c#1~32694~ 2007-12-22 01:23:09.000000000 -0800
+++ perl/x2p/hash.c 2008-01-30 03:03:49.000000000 -0800
@@ -25,7 +25,7 @@
register HENT *entry;
if (!tb)
- return Nullstr;
+ return NULL;
for (s=key, i=0, hash = 0;
/* while */ *s;
s++, i++, hash *= 5) {
@@ -39,7 +39,7 @@
continue;
return entry->hent_val;
}
- return Nullstr;
+ return NULL;
}
bool
@@ -144,6 +144,6 @@
hiterinit(register HASH *tb)
{
tb->tbl_riter = -1;
- tb->tbl_eiter = Null(HENT*);
+ tb->tbl_eiter = (HENT*)NULL;
return tb->tbl_fill;
}
==== //depot/maint-5.10/perl/x2p/str.c#3 (text) ====
Index: perl/x2p/str.c
--- perl/x2p/str.c#2~33119~ 2008-01-30 02:06:52.000000000 -0800
+++ perl/x2p/str.c 2008-01-30 03:03:49.000000000 -0800
@@ -185,7 +185,7 @@
* buffer, so we getc() it back out and stuff it in the buffer.
*/
i = getc(fp);
- if (i == EOF) return Nullch;
+ if (i == EOF) return NULL;
*(--((*fp)->_ptr)) = (unsigned char) i;
(*fp)->_cnt++;
#endif
@@ -239,14 +239,14 @@
static char buf[4192];
- if (fgets(buf, sizeof buf, fp) != Nullch)
+ if (fgets(buf, sizeof buf, fp) != NULL)
str_set(str, buf);
else
str_set(str, No);
#endif /* USE_STDIO_PTR && STDIO_PTR_LVALUE && STDIO_CNT_LVALUE */
- return str->str_cur ? str->str_ptr : Nullch;
+ return str->str_cur ? str->str_ptr : NULL;
}
STR *
==== //depot/maint-5.10/perl/x2p/str.h#3 (text) ====
Index: perl/x2p/str.h
--- perl/x2p/str.h#2~33119~ 2008-01-30 02:06:52.000000000 -0800
+++ perl/x2p/str.h 2008-01-30 03:03:49.000000000 -0800
@@ -19,8 +19,6 @@
char str_nok; /* state of str_nval */
};
-#define Nullstr Null(STR*)
-
/* the following macro updates any magic values this str is associated with */
#define STABSET(x) (x->str_link.str_magic && stabset(x->str_link.str_magic,x))
==== //depot/maint-5.10/perl/x2p/util.c#3 (text) ====
Index: perl/x2p/util.c
--- perl/x2p/util.c#2~33119~ 2008-01-30 02:06:52.000000000 -0800
+++ perl/x2p/util.c 2008-01-30 03:03:49.000000000 -0800
@@ -32,7 +32,7 @@
fprintf(stderr,"0x%lx: (%05d) malloc %ld bytes\n",(unsigned long)ptr,
an++,(long)size);
#endif
- if (ptr != Nullch)
+ if (ptr != NULL)
return ptr;
else {
fputs(nomem,stdout) FLUSH;
@@ -57,7 +57,7 @@
fprintf(stderr,"0x%lx: (%05d) realloc %ld bytes\n",(unsigned
long)ptr,an++,(long)size);
}
#endif
- if (ptr != Nullch)
+ if (ptr != NULL)
return ptr;
else {
fputs(nomem,stdout) FLUSH;
@@ -127,14 +127,14 @@
for (t = big; *t; t++) {
for (x=t,s=little; *s; x++,s++) {
if (!*x)
- return Nullch;
+ return NULL;
if (*s != *x)
break;
}
if (!*s)
return t;
}
- return Nullch;
+ return NULL;
}
/* copy a string to a safe spot */
==== //depot/maint-5.10/perl/x2p/walk.c#3 (text) ====
Index: perl/x2p/walk.c
--- perl/x2p/walk.c#2~33119~ 2008-01-30 02:06:52.000000000 -0800
+++ perl/x2p/walk.c 2008-01-30 03:03:49.000000000 -0800
@@ -23,7 +23,7 @@
const char *rparen;
const char *limit;
STR *subs;
-STR *curargs = Nullstr;
+STR *curargs = NULL;
static void addsemi ( STR *str );
static void emit_split ( STR *str, int level );
@@ -741,10 +741,10 @@
str_cat(curargs,",");
tmp2str=walk(1,level,ops[node+5].ival,&numarg,P_MIN);
str_free(curargs);
- curargs = Nullstr;
+ curargs = NULL;
level--;
subretnum |= numarg;
- s = Nullch;
+ s = NULL;
t = tmp2str->str_ptr;
while ((t = instr(t,"return ")))
s = t++;
@@ -1516,7 +1516,7 @@
}
}
else {
- str = Nullstr;
+ str = NULL;
}
break;
}
End of Patch.
