summaryrefslogtreecommitdiff
path: root/pipe.c
diff options
context:
space:
mode:
authorrsc <rsc>2006-09-06 17:27:19 +0000
committerrsc <rsc>2006-09-06 17:27:19 +0000
commit9e9bcaf143bf8507e947f9934371744c3d50a8ea (patch)
treeb63a03929569f34ade9a940ef1416586346b8d30 /pipe.c
parent03b6376f56074cd1dcbb1b35639e303c3a8a0181 (diff)
downloadxv6-labs-9e9bcaf143bf8507e947f9934371744c3d50a8ea.tar.gz
xv6-labs-9e9bcaf143bf8507e947f9934371744c3d50a8ea.tar.bz2
xv6-labs-9e9bcaf143bf8507e947f9934371744c3d50a8ea.zip
standardize various * conventions
Diffstat (limited to 'pipe.c')
-rw-r--r--pipe.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/pipe.c b/pipe.c
index 6f80810..6df4fbf 100644
--- a/pipe.c
+++ b/pipe.c
@@ -28,7 +28,7 @@ pipe_alloc(struct fd **fd1, struct fd **fd2)
goto oops;
if((*fd2 = fd_alloc()) == 0)
goto oops;
- if((p = (struct pipe *) kalloc(PAGE)) == 0)
+ if((p = (struct pipe*) kalloc(PAGE)) == 0)
goto oops;
p->readopen = 1;
p->writeopen = 1;
@@ -46,7 +46,7 @@ pipe_alloc(struct fd **fd1, struct fd **fd2)
return 0;
oops:
if(p)
- kfree((char *) p, PAGE);
+ kfree((char*) p, PAGE);
if(*fd1){
(*fd1)->type = FD_NONE;
fd_close(*fd1);
@@ -70,11 +70,11 @@ pipe_close(struct pipe *p, int writeable)
p->readopen = 0;
wakeup(&p->writep);
}
-
+
release(&p->lock);
if(p->readopen == 0 && p->writeopen == 0)
- kfree((char *) p, PAGE);
+ kfree((char*) p, PAGE);
}
int