fix the Serious problem with ROFS on-disk format
authorRoss Qin <ross.qin@nokia.com>
Tue, 02 Nov 2010 09:31:04 +0800
changeset 671 ff8ff850b0cf
parent 670 46ea84d14897
child 672 bc9ef8cca9ec
child 676 b5e6747818a9
fix the Serious problem with ROFS on-disk format
imgtools/romtools/rofsbuild/r_build.cpp
imgtools/romtools/rofsbuild/rofsbuild.cpp
--- a/imgtools/romtools/rofsbuild/r_build.cpp	Fri Oct 29 10:03:48 2010 +0800
+++ b/imgtools/romtools/rofsbuild/r_build.cpp	Tue Nov 02 09:31:04 2010 +0800
@@ -82,7 +82,7 @@
 	{
 	TRofsEntry* iEntry;
 	TBool iIsDir;
-	TUint16 iOffset;
+	TUint32 iOffset;
 	};
 
 int compare(const void* l, const void* r)
@@ -621,7 +621,7 @@
 			entry = pFileEntry;
 
 			//Offset in 32bit words from start of file block
-			array[index].iOffset = (TUint16) ((((TUint8*) entry) - fileBlockBase) >> 2);
+			array[index].iOffset = (TUint32) ((((TUint8*) entry) - fileBlockBase) >> 2);
 			array[index].iIsDir = EFalse;
 			}
 		else
@@ -629,7 +629,7 @@
 			entry = pDirEntry;
 
 			//Offset in 32bit words from start of directory block
-			array[index].iOffset = (TUint16) ((((TUint8*) entry) - dirBlockBase) >> 2);
+			array[index].iOffset = (TUint32) ((((TUint8*) entry) - dirBlockBase) >> 2);
 			array[index].iIsDir = ETrue;
 			}
 		array[index].iEntry = entry;
--- a/imgtools/romtools/rofsbuild/rofsbuild.cpp	Fri Oct 29 10:03:48 2010 +0800
+++ b/imgtools/romtools/rofsbuild/rofsbuild.cpp	Tue Nov 02 09:31:04 2010 +0800
@@ -49,7 +49,7 @@
 
 static const TInt RofsbuildMajorVersion=2;
 static const TInt RofsbuildMinorVersion=16;
-static const TInt RofsbuildPatchVersion=1;
+static const TInt RofsbuildPatchVersion=2;
 static TBool SizeSummary=EFalse;
 static TPrintType SizeWhere=EAlways;