X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Ffilesys%2Ffile.h;h=c28201d9b8b82022faf1e80671b5d366b01ec219;hb=35692cf4733c0761f25dc17153eeaf8a64c1e0ee;hp=d165e80bf427123fcd41f1634e5de9cbf117a9b6;hpb=2cf38a4ba2dd965c892767b0d8ee97e67f33b274;p=pintos-anon

diff --git a/src/filesys/file.h b/src/filesys/file.h
index d165e80..c28201d 100644
--- a/src/filesys/file.h
+++ b/src/filesys/file.h
@@ -1,22 +1,11 @@
-#ifndef HEADER_FILE_H
-#define HEADER_FILE_H 1
+#ifndef FILESYS_FILE_H
+#define FILESYS_FILE_H
 
-#include <stdint.h>
 #include <stddef.h>
+#include "devices/disk.h"
+#include "filesys/off_t.h"
 
-#ifndef OFF_T
-#define OFF_T
-typedef int32_t off_t;
-#endif
-
-struct file 
-  {
-    struct filehdr *hdr;
-    off_t pos;
-  };
-
-bool file_open (struct file *, const char *name);
-bool file_open_sector (struct file *, disk_sector_no);
+struct file *file_open (disk_sector_t);
 void file_close (struct file *);
 off_t file_read (struct file *, void *, off_t);
 off_t file_read_at (struct file *, void *, off_t size, off_t start);
@@ -25,5 +14,6 @@ off_t file_write_at (struct file *, const void *, off_t size, off_t start);
 off_t file_length (struct file *);
 void file_seek (struct file *, off_t);
 off_t file_tell (struct file *);
+void file_remove (struct file *);
 
-#endif /* file.h */
+#endif /* filesys/file.h */