diff options
| author | rjn637 <rjn637@RJN637LNX.ap.mot.com> | 2009-09-23 21:15:44 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-09-23 21:15:44 -0700 |
| commit | 1d26090fc5b0118a3333b0ad76a8ca5844905106 (patch) | |
| tree | 031cbe6c52859b78add3a5b31388fbae2c2b1dce | |
| parent | 70c156f8a849746ae6417fd5c323902a471ea32f (diff) | |
| parent | 60d7a5d90e475ba32005300994300bc8bec296bc (diff) | |
| download | yaffs2-1d26090fc5b0118a3333b0ad76a8ca5844905106.tar.gz | |
am 60d7a5d9: Fixed mkyaffs2image tool bug
Merge commit '60d7a5d90e475ba32005300994300bc8bec296bc' into eclair-plus-aosp
* commit '60d7a5d90e475ba32005300994300bc8bec296bc':
Fixed mkyaffs2image tool bug
| -rw-r--r-- | yaffs2/utils/mkyaffs2image.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/yaffs2/utils/mkyaffs2image.c b/yaffs2/utils/mkyaffs2image.c index 53dc019..250cf11 100644 --- a/yaffs2/utils/mkyaffs2image.c +++ b/yaffs2/utils/mkyaffs2image.c @@ -211,8 +211,11 @@ static void little_to_big_endian(yaffs_PackedTags2 *pt) static int write_chunk(__u8 *data, __u32 objId, __u32 chunkId, __u32 nBytes) { + char spare[spareSize]; yaffs_ExtendedTags t; - yaffs_PackedTags2 pt; + yaffs_PackedTags2 *pt = (yaffs_PackedTags2 *)spare; + + memset(spare, 0xff, spareSize); error = write(outFile,data,chunkSize); if(error < 0) return error; @@ -232,15 +235,15 @@ static int write_chunk(__u8 *data, __u32 objId, __u32 chunkId, __u32 nBytes) nPages++; - yaffs_PackTags2(&pt,&t); + yaffs_PackTags2(pt,&t); if (convert_endian) { - little_to_big_endian(&pt); + little_to_big_endian(pt); } // return write(outFile,&pt,sizeof(yaffs_PackedTags2)); - return write(outFile,&pt,spareSize); + return write(outFile,spare, spareSize); } |