Просмотр исходного кода

* extfs.h: Move private structures ...
* extfs.c: ... here.

Pavel Roskin 23 лет назад
Родитель
Сommit
4b54385dc6
3 измененных файлов с 37 добавлено и 40 удалено
  1. 3 0
      vfs/ChangeLog
  2. 34 7
      vfs/extfs.c
  3. 0 33
      vfs/extfs.h

+ 3 - 0
vfs/ChangeLog

@@ -1,5 +1,8 @@
 2001-08-07  Pavel Roskin  <proski@gnu.org>
 
+	* extfs.h: Move private structures ...
+	* extfs.c: ... here.
+
 	* extfs.h (struct entry): Remove unused `has_changed' field.
 	It's only written but never read.
 	(struct inode): Likewise.

+ 34 - 7
vfs/extfs.c

@@ -47,6 +47,40 @@
 #undef ERRNOR
 #define ERRNOR(x,y) do { my_errno = x; return y; } while(0)
 
+struct inode {
+    nlink_t nlink;
+    struct entry *first_in_subdir; /* only used if this is a directory */
+    struct entry *last_in_subdir;
+    ino_t inode;        /* This is inode # */
+    dev_t dev;		/* This is an internal identification of the extfs archive */
+    struct archive *archive; /* And this is an archive structure */
+    dev_t rdev;
+    mode_t mode;
+    uid_t uid;
+    gid_t gid;
+    int size;
+    time_t mtime;
+    char linkflag;
+    char *linkname;
+    time_t atime;
+    time_t ctime;
+    char *local_filename;
+};
+
+struct entry {
+    struct entry *next_in_dir;
+    struct entry *dir;
+    char *name;
+    struct inode *inode;
+};
+
+struct pseudofile {
+    struct archive *archive;
+    unsigned int has_changed:1;
+    int local_handle;
+    struct entry *entry;
+};
+
 static struct entry *
 find_entry (struct entry *dir, char *name, int make_dirs, int make_file);
 static int extfs_which (vfs *me, char *path);
@@ -524,13 +558,6 @@ static struct entry *my_resolve_symlinks (struct entry *entry)
     return res;
 }
 
-struct pseudofile {
-    struct archive *archive;
-    unsigned int has_changed:1;
-    int local_handle;
-    struct entry *entry;
-};
-
 static char *get_archive_name (struct archive *archive)
 {
     char *archive_name;

+ 0 - 33
vfs/extfs.h

@@ -18,39 +18,6 @@ You should have received a copy of the GNU General Public License
 along with this program; see the file COPYING.  If not, write to
 the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
-#include <sys/types.h>
-
-struct inode;
-
-struct entry {
-    struct entry *next_in_dir;
-    struct entry *dir;
-    char *name;
-    struct inode *inode;
-};
-
-struct archive;
-
-struct inode {
-    nlink_t nlink;
-    struct entry *first_in_subdir; /* only used if this is a directory */
-    struct entry *last_in_subdir;
-    ino_t inode;        /* This is inode # */
-    dev_t dev;		/* This is an internal identification of the extfs archive */
-    struct archive *archive; /* And this is an archive structure */
-    dev_t rdev;
-    mode_t mode;	/* What is umode_t? It will not compile for me, changed it t mode_t */
-    uid_t uid;
-    gid_t gid;
-    int size;
-    time_t mtime;
-    char linkflag;
-    char *linkname;
-    time_t atime;
-    time_t ctime;
-    char *local_filename;
-};
-
 struct archive {
     int fstype;
     char *name;