[Linux-NTFS-cvs] CVS: linux-ntfs/include disk_io.h,1.7,1.8 mft.h,1.21,1.22 types.h,1.1,1.2

[Anton A. <an...@us...>]

Changes by: antona

Update of /cvsroot/linux-ntfs/linux-ntfs/include
In directory usw-pr-cvs1:/tmp/cvs-serv5121/include

Modified Files:
	disk_io.h mft.h types.h 
Log Message:
Almost fixed compilaton. Remember to declare a struct type with
struct NAME { declaration }; rather than the bogus struct { declaration NAME };
then can use typedef NAME othername; on a forward declaration of NAME
(struct NAME;) and all is fine...



Index: disk_io.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/disk_io.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -U2 -r1.7 -r1.8
--- disk_io.h	2001/04/11 11:49:16	1.7
+++ disk_io.h	2001/04/11 14:29:11	1.8
@@ -150,8 +150,9 @@
 int put_clusters(ntfs_volume *vol, const __u8 *buf, const __s64 lcn, int count);
 
-int get_mft_records(const ntfs_volume *vol, __u8 *buf,
+int get_mft_records(const ntfs_volume *vol, const MFT_RECORD *mrec,
 		    const MFT_REF *mref, const int count);
 
-extern __inline__ int get_mft_record(const ntfs_volume *vol, __u8 *buf,
+extern __inline__ int get_mft_record(const ntfs_volume *vol,
+				     const MFT_RECORD *mrec,
 				     const MFT_REF *mref);
 

Index: mft.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/mft.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -U2 -r1.21 -r1.22
--- mft.h	2001/04/11 11:49:16	1.21
+++ mft.h	2001/04/11 14:29:11	1.22
@@ -235,6 +235,5 @@
  */
 int insert_mft_entry(ntfs_volume *vol, mft_entry **me, const MFT_REF mref,
-		     const MFT_RECORD *mrec, const BOOL dirty,
-		     const ntfs_file *f);
+		     MFT_RECORD *mrec, const BOOL dirty, ntfs_file *f);
 
 /**

Index: types.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/types.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -U2 -r1.1 -r1.2
--- types.h	2001/04/11 11:50:24	1.1
+++ types.h	2001/04/11 14:29:11	1.2
@@ -267,4 +267,5 @@
 
 struct _ntfs_file;
+typedef struct _ntfs_file ntfs_file;
 
 typedef struct {
@@ -273,21 +274,18 @@
 	MFT_REF m_ref;
  	unsigned int m_count;
-	struct _ntfs_file *m_file;
+	ntfs_file *m_file;
  	struct list_head m_list;
 	struct list_head m_dirty_list;
-	struct _ntfs_volume *m_vol;
+	ntfs_volume *m_vol;
 } mft_entry;
 
-struct {
+struct _ntfs_file {
 	MFT_REF *m_refs;
-	mft_entry *m_entries;
+	mft_entry **m_entries;
 	int nr_m_refs;
 	int f_count;
 	struct list_head f_list;
-	struct _ntfs_volume *f_vol;
-} _ntfs_file;
-
-typedef struct _ntfs_file ntfs_file;
-
+	ntfs_volume *f_vol;
+};