--- a/userlibandfileserver/fileserver/sfat32/fat_dir_entry.h	Tue Feb 02 01:24:03 2010 +0200
+++ b/userlibandfileserver/fileserver/sfat32/fat_dir_entry.h	Fri Apr 16 16:24:37 2010 +0300
@@ -29,7 +29,7 @@
 
 
 const TInt      KFatDirNameSize         = 11;   ///< Dos directory/File name length
-const TInt      KVFatEntryAttribute     = 0x0F;  ///< VFat entry attribute setting
+const TUint     KVFatEntryAttribute     = 0x0F;  ///< VFat entry attribute setting
 const TUint8    KDotEntryByte           = 0x2e;  ///< Dot value for self and parent pointer directory entries
 const TUint8    KBlankSpace             = 0x20;  ///< Blank space in a directory entry
 const TInt      KSizeOfFatDirEntryLog2  = 5;     ///< Log2 of size in bytes of a Fat directry entry 
@@ -74,42 +74,57 @@
     inline void InitZ();
 
     inline const TPtrC8 Name() const;
-    inline TInt Attributes() const;
+    inline void SetName(const TDesC8& aDes);
+
+    inline TUint Attributes() const;
+    inline void SetAttributes(TUint anAtt);
+
     inline TTime Time(TTimeIntervalSeconds aOffset) const;
-    inline TInt StartCluster() const;
+    inline void SetTime(TTime aTime, TTimeIntervalSeconds aOffset);
+    inline TBool IsTimeTheSame(TTime aTime, TTimeIntervalSeconds aOffset) const; 
+    
+
+    inline TUint32 StartCluster() const;
+    inline void SetStartCluster(TUint32 aStartCluster);
+
     inline TUint32 Size() const;
+    inline void SetSize(TUint32 aFilesize);
+
     inline TBool IsErased() const;
+    inline void SetErased();
+
     inline TBool IsCurrentDirectory() const;
+    inline void SetCurrentDirectory();
+
     inline TBool IsParentDirectory() const;
+    inline void SetParentDirectory();
+
     inline TBool IsEndOfDirectory() const;
+    inline void SetEndOfDirectory();
+
     inline TBool IsGarbage() const;
-    inline void SetName(const TDesC8& aDes);
-    inline void SetAttributes(TInt anAtt);
-    inline void SetTime(TTime aTime, TTimeIntervalSeconds aOffset);
+    
     inline void SetCreateTime(TTime aTime, TTimeIntervalSeconds aOffset);
-    inline void SetStartCluster(TInt aStartCluster);
-    inline void SetSize(TUint32 aFilesize);
-    inline void SetErased();
-    inline void SetCurrentDirectory();
-    inline void SetParentDirectory();
-    inline void SetEndOfDirectory();
-    inline TUint RuggedFatEntryId() const;
+
+    inline TUint16 RuggedFatEntryId() const;
     inline void  SetRuggedFatEntryId(TUint16 aId);
 
-public:
-    void InitializeAsVFat(TUint8 aCheckSum);
-    void SetVFatEntry(const TDesC& aName,TInt aRemainderLen);
+    inline TInt NumFollowing() const;
+    inline TUint8 CheckSum() const;
+
+    void SetVFatEntry(const TDesC& aName, TUint aRemainderLen, TUint8 aCheckSum);
     void ReadVFatEntry(TDes16& aVBuf) const;
+    
     inline TBool IsLongNameStart() const;
     inline TBool IsVFatEntry() const;
-    inline TInt NumFollowing() const;
-    inline TUint8 CheckSum() const;
 
 
 public:
     TUint8 iData[KSizeOfFatDirEntry]; ///< The directory entry data
     };
 
+__ASSERT_COMPILE((sizeof(TFatDirEntry) == KSizeOfFatDirEntry));
+__ASSERT_COMPILE((sizeof(SFatDirEntry) == KSizeOfFatDirEntry));
 
 
 #endif //FAT_DIR_ENTRY_H