yaffs: More clean up

[yaffs2.git] / yaffs_packedtags1.c

diff --git a/yaffs_packedtags1.c b/yaffs_packedtags1.c
index db136b9faeeae269e19c27cc7ca1e4da2dc2ac0c..45dd54d57a8c7ff93dbd88de7e9469195e8ab078 100644 (file)
--- a/yaffs_packedtags1.c
+++ b/yaffs_packedtags1.c
@@ -14,37 +14,37 @@
 #include "yaffs_packedtags1.h"
 #include "yportenv.h"
 
-void yaffs_PackTags1(yaffs_PackedTags1 *pt, const yaffs_ExtendedTags *t)
+void yaffs_pack_tags1(yaffs_packed_tags1 *pt, const struct yaffs_ext_tags *t)
 {
-       pt->chunkId = t->chunkId;
-       pt->serialNumber = t->serialNumber;
-       pt->byteCount = t->byteCount;
-       pt->objectId = t->objectId;
+       pt->chunk_id = t->chunk_id;
+       pt->serial_number = t->serial_number;
+       pt->n_bytes = t->n_bytes;
+       pt->obj_id = t->obj_id;
        pt->ecc = 0;
-       pt->deleted = (t->chunkDeleted) ? 0 : 1;
-       pt->unusedStuff = 0;
-       pt->shouldBeFF = 0xFFFFFFFF;
+       pt->deleted = (t->is_deleted) ? 0 : 1;
+       pt->unused_stuff = 0;
+       pt->should_be_ff = 0xFFFFFFFF;
 
 }
 
-void yaffs_unpack_tags1(yaffs_ExtendedTags *t, const yaffs_PackedTags1 *pt)
+void yaffs_unpack_tags1(struct yaffs_ext_tags *t, const yaffs_packed_tags1 *pt)
 {
-       static const __u8 allFF[] =
+       static const u8 all_ff[] =
            { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
 0xff };
 
-       if (memcmp(allFF, pt, sizeof(yaffs_PackedTags1))) {
-               t->blockBad = 0;
-               if (pt->shouldBeFF != 0xFFFFFFFF)
-                       t->blockBad = 1;
-               t->chunkUsed = 1;
-               t->objectId = pt->objectId;
-               t->chunkId = pt->chunkId;
-               t->byteCount = pt->byteCount;
-               t->eccResult = YAFFS_ECC_RESULT_NO_ERROR;
-               t->chunkDeleted = (pt->deleted) ? 0 : 1;
-               t->serialNumber = pt->serialNumber;
+       if (memcmp(all_ff, pt, sizeof(yaffs_packed_tags1))) {
+               t->block_bad = 0;
+               if (pt->should_be_ff != 0xFFFFFFFF)
+                       t->block_bad = 1;
+               t->chunk_used = 1;
+               t->obj_id = pt->obj_id;
+               t->chunk_id = pt->chunk_id;
+               t->n_bytes = pt->n_bytes;
+               t->ecc_result = YAFFS_ECC_RESULT_NO_ERROR;
+               t->is_deleted = (pt->deleted) ? 0 : 1;
+               t->serial_number = pt->serial_number;
        } else {
-               memset(t, 0, sizeof(yaffs_ExtendedTags));
+               memset(t, 0, sizeof(struct yaffs_ext_tags));
        }
 }