diff options
| author | kstailey <kstailey@cvs.openbsd.org> | 1997-06-19 13:58:50 +0000 |
|---|---|---|
| committer | kstailey <kstailey@cvs.openbsd.org> | 1997-06-19 13:58:50 +0000 |
| commit | bf8005adcfb58b3ee760f1d617bbc31a94c84c52 (patch) | |
| tree | aa8605cd9b71bcd70c5bb79a75cbf3dc3a31643e /bin/ksh/shf.c | |
| parent | d70fd816bbcfe3ed69974e4c2a2dd94318c675c9 (diff) | |
back out
Diffstat (limited to 'bin/ksh/shf.c')
| -rw-r--r-- | bin/ksh/shf.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/bin/ksh/shf.c b/bin/ksh/shf.c index 4c324158aba..78266aa9b26 100644 --- a/bin/ksh/shf.c +++ b/bin/ksh/shf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: shf.c,v 1.2 1997/06/18 22:42:43 kstailey Exp $ */ +/* $OpenBSD: shf.c,v 1.3 1997/06/19 13:58:46 kstailey Exp $ */ /* * Shell file I/O routines @@ -52,7 +52,7 @@ shf_open(name, oflags, mode, sflags) : ((oflags & O_ACCMODE) == O_WRONLY ? SHF_WR : SHF_RDWR); - return shf_fdopen(fd, sflags, NULL); + return shf_fdopen(fd, sflags, (struct shf *) 0); } /* Set up the shf structure for a file descriptor. Doesn't fail. */ @@ -87,7 +87,7 @@ shf_fdopen(fd, sflags, shf) shf->buf = (unsigned char *) alloc(bsize, ATEMP); sflags |= SHF_ALLOCB; } else - shf->buf = NULL; + shf->buf = (unsigned char *) 0; } else { shf = (struct shf *) alloc(sizeof(struct shf) + bsize, ATEMP); shf->buf = (unsigned char *) &shf[1]; @@ -536,7 +536,7 @@ shf_getse(buf, bsize, shf) internal_errorf(1, "shf_getse: flags %x", shf->flags); if (bsize <= 0) - return NULL; + return (char *) 0; --bsize; /* save room for null */ do { @@ -793,7 +793,7 @@ shf_smprintf(fmt, va_alist) struct shf shf; va_list args; - shf_sopen(NULL, 0, SHF_WR|SHF_DYNAMIC, &shf); + shf_sopen((char *) 0, 0, SHF_WR|SHF_DYNAMIC, &shf); SH_VA_START(args, fmt); shf_vfprintf(&shf, fmt, args); va_end(args); |