[Linux-ntfs-cvs] CVS: linux-ntfs/include attrib.h,1.6,1.7 mft.h,1.4,1.5 volume.h,1.2,1.3

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

Changes by: antona

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

Modified Files:
	attrib.h mft.h volume.h 
Log Message:
Fixed the compilation issues.


Index: attrib.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/attrib.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** attrib.h	2001/01/30 12:29:03	1.6
--- attrib.h	2001/01/30 12:55:21	1.7
***************
*** 453,457 ****
  						   (Unicode) characters. */
  	FILENAME_TYPE_FLAGS filename_type;	/* Namespace of the filename. */
! 	__u16 filename[filename_length];	/* Filename in Unicode. */
  } __attribute__ ((__packed__)) FILENAME_ATTRIBUTE;
  
--- 453,457 ----
  						   (Unicode) characters. */
  	FILENAME_TYPE_FLAGS filename_type;	/* Namespace of the filename. */
! 	__u16 filename[0];			/* Filename in Unicode. */
  } __attribute__ ((__packed__)) FILENAME_ATTRIBUTE;
  
***************
*** 543,548 ****
  typedef struct {
  	__u64 reserved;		/* Not used (yet?). */
! 	__u8 major_version;	/* Major version of the ntfs format. */
! 	__u8 minor_version;	/* Minor version of the ntfs format. */
  	VOLUME_FLAGS flags;	/* Bit array of VOLUME_* flags. */
  } __attribute__ ((__packed__)) VOLUME_INFORMATION;
--- 543,548 ----
  typedef struct {
  	__u64 reserved;		/* Not used (yet?). */
! 	__u8 major_ver;		/* Major version of the ntfs format. */
! 	__u8 minor_ver;		/* Minor version of the ntfs format. */
  	VOLUME_FLAGS flags;	/* Bit array of VOLUME_* flags. */
  } __attribute__ ((__packed__)) VOLUME_INFORMATION;
***************
*** 730,736 ****
  } __attribute__ ((__packed__)) EA_INFORMATION;
  
! typedef enum {
  //	NEED_EA	= ???;
! } EA_FLAGS;
  
  /*
--- 730,736 ----
  } __attribute__ ((__packed__)) EA_INFORMATION;
  
! //typedef enum {
  //	NEED_EA	= ???;
! //} EA_FLAGS;
  
  /*
***************
*** 748,753 ****
  					   attribute in bytes. */
  	__u16 ea_value_length;		/* Byte size of the EA's value. */
! 	__u8 ea_name[ea_name_length];	/* Name of the EA. */
! 	__u8 ea_data[ea_value_length];	/* The value of the EA. Immediately
  					   follows the name. */
  } __attribute__ ((__packed__)) EA_ATTRIBUTE;
--- 748,753 ----
  					   attribute in bytes. */
  	__u16 ea_value_length;		/* Byte size of the EA's value. */
! 	__u8 ea_name[0];		/* Name of the EA. */
! 	__u8 ea_value[0];		/* The value of the EA. Immediately
  					   follows the name. */
  } __attribute__ ((__packed__)) EA_ATTRIBUTE;
***************
*** 913,917 ****
   */
  int set_attribute_value(ntfs_volume *vol, ATTRIBUTE_RECORD_HEADER *a,
! 			const __u8 *b, const __u64 l);
  
  #endif /* defined ATTRIB_H */
--- 913,917 ----
   */
  int set_attribute_value(ntfs_volume *vol, ATTRIBUTE_RECORD_HEADER *a,
! 			const __u8 *b, __u64 l);
  
  #endif /* defined ATTRIB_H */

Index: mft.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/mft.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** mft.h	2001/01/30 12:29:03	1.4
--- mft.h	2001/01/30 12:55:21	1.5
***************
*** 195,199 ****
  /**
   * get_mft_record_data_size - return number of bytes used in mft record @b
!  * @b: the mft record to get the data size of
   *
   * Takes the mft record @b and returns the number of bytes used in the record
--- 195,199 ----
  /**
   * get_mft_record_data_size - return number of bytes used in mft record @b
!  * @b:		mft record to get the data size of
   *
   * Takes the mft record @b and returns the number of bytes used in the record

Index: volume.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/volume.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** volume.h	2001/01/25 14:00:43	1.2
--- volume.h	2001/01/30 12:55:21	1.3
***************
*** 67,71 ****
  	__s64 mft_lcn;		/* Logical cluster number of the data attribute
  				   for FILE_$Mft. */
!        	__s64 mft_mirr_lcn;	/* Logical cluster number of the data attribute
  				   for FILE_$MftMirr. */
  	__u8 cluster_size_bits;	/* Log(2) of the byte size of a cluster. */
--- 67,71 ----
  	__s64 mft_lcn;		/* Logical cluster number of the data attribute
  				   for FILE_$Mft. */
!        	__s64 mftmirr_lcn;	/* Logical cluster number of the data attribute
  				   for FILE_$MftMirr. */
  	__u8 cluster_size_bits;	/* Log(2) of the byte size of a cluster. */
***************
*** 84,88 ****
  	__s64 number_of_mft_records;	/* Number of records in the mft, equals
  					   the number of bits in mft_bitmap. */
! 	__u16 *upcase[65536];		/* Upper case equivalents of all 65536 
  					   2-byte Unicode characters. Obtained
  					   from FILE_$UpCase. */
--- 84,88 ----
  	__s64 number_of_mft_records;	/* Number of records in the mft, equals
  					   the number of bits in mft_bitmap. */
! 	__u16 *upcase;			/* Upper case equivalents of all 65536 
  					   2-byte Unicode characters. Obtained
  					   from FILE_$UpCase. */