diff options
author | rsc <rsc> | 2007-08-28 04:22:35 +0000 |
---|---|---|
committer | rsc <rsc> | 2007-08-28 04:22:35 +0000 |
commit | 7834cca60426ea156822ba05d702cf56a914467d (patch) | |
tree | 31b30e67a8df5e70fc5605abc6dac0912f489f20 /file.c | |
parent | 76f09d7dd00f84bf69f7b83983c3b4843223f616 (diff) | |
download | xv6-labs-7834cca60426ea156822ba05d702cf56a914467d.tar.gz xv6-labs-7834cca60426ea156822ba05d702cf56a914467d.tar.bz2 xv6-labs-7834cca60426ea156822ba05d702cf56a914467d.zip |
remove _ from pipe; be like file
Diffstat (limited to 'file.c')
-rw-r--r-- | file.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -65,7 +65,7 @@ fileclose(struct file *f) release(&file_table_lock); if(ff.type == FD_PIPE) - pipe_close(ff.pipe, ff.writable); + pipeclose(ff.pipe, ff.writable); else if(ff.type == FD_INODE) iput(ff.ip); else @@ -94,7 +94,7 @@ fileread(struct file *f, char *addr, int n) if(f->readable == 0) return -1; if(f->type == FD_PIPE) - return pipe_read(f->pipe, addr, n); + return piperead(f->pipe, addr, n); if(f->type == FD_INODE){ ilock(f->ip); if((r = readi(f->ip, addr, f->off, n)) > 0) @@ -114,7 +114,7 @@ filewrite(struct file *f, char *addr, int n) if(f->writable == 0) return -1; if(f->type == FD_PIPE) - return pipe_write(f->pipe, addr, n); + return pipewrite(f->pipe, addr, n); if(f->type == FD_INODE){ ilock(f->ip); if((r = writei(f->ip, addr, f->off, n)) > 0) |