summaryrefslogtreecommitdiff
path: root/defs.h
diff options
context:
space:
mode:
authorrsc <rsc>2006-09-06 18:38:56 +0000
committerrsc <rsc>2006-09-06 18:38:56 +0000
commit39593d2f1aab1355d61b75c041b31a88d2043a04 (patch)
tree12f6a0ff59c925e6f412e5fdb506484da513fd39 /defs.h
parent89ebd895b8d1efe2d562971e6cdcb6571982b5b1 (diff)
downloadxv6-labs-39593d2f1aab1355d61b75c041b31a88d2043a04.tar.gz
xv6-labs-39593d2f1aab1355d61b75c041b31a88d2043a04.tar.bz2
xv6-labs-39593d2f1aab1355d61b75c041b31a88d2043a04.zip
struct fd -> struct file
Diffstat (limited to 'defs.h')
-rw-r--r--defs.h16
1 files changed, 8 insertions, 8 deletions
diff --git a/defs.h b/defs.h
index 8731c27..1491a8e 100644
--- a/defs.h
+++ b/defs.h
@@ -84,8 +84,8 @@ void load_icode(struct proc*, uchar*, uint);
// pipe.c
struct pipe;
-struct fd;
-int pipe_alloc(struct fd**, struct fd**);
+struct file;
+int pipe_alloc(struct file**, struct file**);
void pipe_close(struct pipe*, int);
int pipe_write(struct pipe*, char*, int);
int pipe_read(struct pipe*, char*, int);
@@ -94,12 +94,12 @@ int pipe_read(struct pipe*, char*, int);
struct stat;
void fd_init(void);
int fd_ualloc(void);
-struct fd* fd_alloc(void);
-void fd_close(struct fd*);
-int fd_read(struct fd*, char*, int n);
-int fd_write(struct fd*, char*, int n);
-int fd_stat(struct fd*, struct stat*);
-void fd_incref(struct fd*);
+struct file* fd_alloc(void);
+void fd_close(struct file*);
+int fd_read(struct file*, char*, int n);
+int fd_write(struct file*, char*, int n);
+int fd_stat(struct file*, struct stat*);
+void fd_incref(struct file*);
// ide.c
void ide_init(void);