diff options
| author |   deraadt <deraadt@openbsd.org> | 1999-06-07 01:38:44 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 1999-06-07 01:38:44 +0000 |
| commit | 514de928037c7e985d8890d48b9232e6bd32b4d5 (patch) | |
| tree | b4c7671c1f884b7767f4cd8f0b123cb85a68a11d | |
| parent | move CC, CCX, and COPTS forward; wd@ics.nara-wu.ac.jp (diff) | |
| download | wireguard-openbsd-514de928037c7e985d8890d48b9232e6bd32b4d5.tar.xz wireguard-openbsd-514de928037c7e985d8890d48b9232e6bd32b4d5.zip | |
store NULL in fd_ofiles
| -rw-r--r-- | sys/kern/sys_pipe.c | 6 | ||||
| -rw-r--r-- | sys/kern/uipc_syscalls.c | 12 |
2 files changed, 9 insertions, 9 deletions
diff --git a/sys/kern/sys_pipe.c b/sys/kern/sys_pipe.c index 202046283de..eeb716bf98c 100644 --- a/sys/kern/sys_pipe.c +++ b/sys/kern/sys_pipe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sys_pipe.c,v 1.10 1999/02/26 05:12:18 art Exp $ */ +/* $OpenBSD: sys_pipe.c,v 1.11 1999/06/07 01:38:44 deraadt Exp $ */ /* * Copyright (c) 1996 John S. Dyson @@ -156,7 +156,7 @@ int #if defined(__FreeBSD__) pipe(p, uap, retval) #else /* (__NetBSD__) || (__OpenBSD__) */ -sys_pipe(p, v, retval) +sys_opipe(p, v, retval) #endif struct proc *p; void *v; @@ -201,7 +201,7 @@ sys_pipe(p, v, retval) return (0); free3: ffree(rf); - fdp->fd_ofiles[retval[0]] = 0; + fdp->fd_ofiles[retval[0]] = NULL; free2: (void)pipeclose(wpipe); (void)pipeclose(rpipe); diff --git a/sys/kern/uipc_syscalls.c b/sys/kern/uipc_syscalls.c index 09222e6654a..ffc0ee9fa7a 100644 --- a/sys/kern/uipc_syscalls.c +++ b/sys/kern/uipc_syscalls.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uipc_syscalls.c,v 1.19 1999/02/15 21:28:23 millert Exp $ */ +/* $OpenBSD: uipc_syscalls.c,v 1.20 1999/06/07 01:38:44 deraadt Exp $ */ /* $NetBSD: uipc_syscalls.c,v 1.19 1996/02/09 19:00:48 christos Exp $ */ /* @@ -85,7 +85,7 @@ sys_socket(p, v, retval) error = socreate(SCARG(uap, domain), &so, SCARG(uap, type), SCARG(uap, protocol)); if (error) { - fdp->fd_ofiles[fd] = 0; + fdp->fd_ofiles[fd] = NULL; ffree(fp); } else { fp->f_data = (caddr_t)so; @@ -327,10 +327,10 @@ sys_socketpair(p, v, retval) return (error); free4: ffree(fp2); - fdp->fd_ofiles[sv[1]] = 0; + fdp->fd_ofiles[sv[1]] = NULL; free3: ffree(fp1); - fdp->fd_ofiles[sv[0]] = 0; + fdp->fd_ofiles[sv[0]] = NULL; free2: (void)soclose(so2); free1: @@ -870,10 +870,10 @@ sys_pipe(p, v, retval) return (0); free4: ffree(wf); - fdp->fd_ofiles[retval[1]] = 0; + fdp->fd_ofiles[retval[1]] = NULL; free3: ffree(rf); - fdp->fd_ofiles[retval[0]] = 0; + fdp->fd_ofiles[retval[0]] = NULL; free2: (void)soclose(wso); free1: |