Merge branch 'master' of ssh://www.aleph1.co.uk/home/aleph1/git/yaffs2

[yaffs2.git] / yaffs_packedtags1.c

diff --git a/yaffs_packedtags1.c b/yaffs_packedtags1.c
index 45dd54d57a8c7ff93dbd88de7e9469195e8ab078..873f06520b0322782aaad2a4678bf4d039681894 100644 (file)
--- a/yaffs_packedtags1.c
+++ b/yaffs_packedtags1.c
@@ -14,7 +14,8 @@
 #include "yaffs_packedtags1.h"
 #include "yportenv.h"
 
-void yaffs_pack_tags1(yaffs_packed_tags1 *pt, const struct yaffs_ext_tags *t)
+void yaffs_pack_tags1(struct yaffs_packed_tags1 *pt,
+                     const struct yaffs_ext_tags *t)
 {
        pt->chunk_id = t->chunk_id;
        pt->serial_number = t->serial_number;
@@ -24,16 +25,18 @@ void yaffs_pack_tags1(yaffs_packed_tags1 *pt, const struct yaffs_ext_tags *t)
        pt->deleted = (t->is_deleted) ? 0 : 1;
        pt->unused_stuff = 0;
        pt->should_be_ff = 0xFFFFFFFF;
-
 }
 
-void yaffs_unpack_tags1(struct yaffs_ext_tags *t, const yaffs_packed_tags1 *pt)
+void yaffs_unpack_tags1(struct yaffs_ext_tags *t,
+                       const struct yaffs_packed_tags1 *pt)
 {
-       static const u8 all_ff[] =
-           { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-0xff };
+       static const u8 all_ff[12] = {
+               0xff, 0xff, 0xff, 0xff,
+               0xff, 0xff, 0xff, 0xff,
+               0xff, 0xff, 0xff, 0xff
+       };
 
-       if (memcmp(all_ff, pt, sizeof(yaffs_packed_tags1))) {
+       if (memcmp(all_ff, pt, sizeof(struct yaffs_packed_tags1))) {
                t->block_bad = 0;
                if (pt->should_be_ff != 0xFFFFFFFF)
                        t->block_bad = 1;