From 4b54385dc6f9c4662cedd6e49ae1a3f6f7792f26 Mon Sep 17 00:00:00 2001 From: Pavel Roskin Date: Tue, 7 Aug 2001 23:54:35 +0000 Subject: [PATCH] * extfs.h: Move private structures ... * extfs.c: ... here. --- vfs/ChangeLog | 3 +++ vfs/extfs.c | 41 ++++++++++++++++++++++++++++++++++------- vfs/extfs.h | 33 --------------------------------- 3 files changed, 37 insertions(+), 40 deletions(-) diff --git a/vfs/ChangeLog b/vfs/ChangeLog index a5ccf41b3..396e82732 100644 --- a/vfs/ChangeLog +++ b/vfs/ChangeLog @@ -1,5 +1,8 @@ 2001-08-07 Pavel Roskin + * 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. diff --git a/vfs/extfs.c b/vfs/extfs.c index 89e251b70..6cefcca2e 100644 --- a/vfs/extfs.c +++ b/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; diff --git a/vfs/extfs.h b/vfs/extfs.h index 0764da4e1..67a828219 100644 --- a/vfs/extfs.h +++ b/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 - -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;