X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=yaffs_guts.c;h=d6e4b11a90acff73824a5a2c94c42707b2884b01;hp=4af4c4094a4d348446870e070d79ef62c09d3f95;hb=a20eabd566c09b175df2b2d49ac328b8be114204;hpb=53c45617c6cbeffcafce1e96e868fcf516e62373

diff --git a/yaffs_guts.c b/yaffs_guts.c
index 4af4c40..d6e4b11 100644
--- a/yaffs_guts.c
+++ b/yaffs_guts.c
@@ -12,7 +12,7 @@
  */
 
 const char *yaffs_guts_c_version =
-    "$Id: yaffs_guts.c,v 1.99 2009-12-14 22:03:05 charles Exp $";
+    "$Id: yaffs_guts.c,v 1.101 2009-12-25 01:53:05 charles Exp $";
 
 #include "yportenv.h"
 
@@ -554,8 +554,8 @@ static void yaffs_VerifyObjectHeader(yaffs_Object *obj, yaffs_ObjectHeader *oh,
 
 	if (!(tags && obj && oh)) {
 		T(YAFFS_TRACE_VERIFY,
-				(TSTR("Verifying object header tags %x obj %x oh %x"TENDSTR),
-				(__u32)tags, (__u32)obj, (__u32)oh));
+				(TSTR("Verifying object header tags %p obj %p oh %p"TENDSTR),
+				tags, obj, oh));
 		return;
 	}
 
@@ -1818,17 +1818,32 @@ static yaffs_Tnode *yaffs_PruneWorker(yaffs_Device *dev, yaffs_Tnode *tn,
 	if (tn) {
 		hasData = 0;
 
-		for (i = 0; i < YAFFS_NTNODES_INTERNAL; i++) {
-			if (tn->internal[i] && level > 0) {
-				tn->internal[i] =
-				    yaffs_PruneWorker(dev, tn->internal[i],
-						      level - 1,
-						      (i == 0) ? del0 : 1);
-			}
+		if(level > 0){
+        		for (i = 0; i < YAFFS_NTNODES_INTERNAL; i++) {
+	        		if (tn->internal[i]) {
+		        		tn->internal[i] =
+		        		        yaffs_PruneWorker(dev, tn->internal[i],
+						        level - 1,
+						        (i == 0) ? del0 : 1);
+        			}
+
+	        		if (tn->internal[i])
+		        		hasData++;
+                        }
+		} else {
+		        int tnodeSize;
+		        __u32 *map = (__u32 *)tn;
+                	tnodeSize = (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8;
 
-			if (tn->internal[i])
-				hasData++;
-		}
+                	if (tnodeSize < sizeof(yaffs_Tnode))
+                	        tnodeSize = sizeof(yaffs_Tnode);
+                        tnodeSize /= sizeof(__u32);
+
+                        for(i = 0; !hasData && i < tnodeSize; i++){
+                                if(map[i])
+                                        hasData++;
+                        }
+                }
 
 		if (hasData == 0 && del0) {
 			/* Free and return NULL */
@@ -4519,8 +4534,8 @@ static int yaffs_WriteCheckpointObjects(yaffs_Device *dev)
 					cp.structType = sizeof(cp);
 
 					T(YAFFS_TRACE_CHECKPOINT, (
-						TSTR("Checkpoint write object %d parent %d type %d chunk %d obj addr %x" TENDSTR),
-						cp.objectId, cp.parentId, cp.variantType, cp.hdrChunk, (unsigned) obj));
+						TSTR("Checkpoint write object %d parent %d type %d chunk %d obj addr %p" TENDSTR),
+						cp.objectId, cp.parentId, cp.variantType, cp.hdrChunk, obj));
 
 					ok = (yaffs_CheckpointWrite(dev, &cp, sizeof(cp)) == sizeof(cp));
 
@@ -4553,7 +4568,7 @@ static int yaffs_ReadCheckpointObjects(yaffs_Device *dev)
 		ok = (yaffs_CheckpointRead(dev, &cp, sizeof(cp)) == sizeof(cp));
 		if (cp.structType != sizeof(cp)) {
 			T(YAFFS_TRACE_CHECKPOINT, (TSTR("struct size %d instead of %d ok %d"TENDSTR),
-				cp.structType, sizeof(cp), ok));
+				cp.structType, (int)sizeof(cp), ok));
 			ok = 0;
 		}
 
@@ -7821,7 +7836,7 @@ static void yaffs_VerifyFreeChunks(yaffs_Device *dev)
 	do { \
 		if (sizeof(structure) != syze) { \
 			T(YAFFS_TRACE_ALWAYS, (TSTR("%s should be %d but is %d\n" TENDSTR),\
-				name, syze, sizeof(structure))); \
+				name, syze, (int) sizeof(structure))); \
 			return YAFFS_FAIL; \
 		} \
 	} while (0)
@@ -7832,7 +7847,7 @@ static int yaffs_CheckStructures(void)
 /*      yaffs_CheckStruct(yaffs_TagsUnion,8,"yaffs_TagsUnion"); */
 /*      yaffs_CheckStruct(yaffs_Spare,16,"yaffs_Spare"); */
 #ifndef CONFIG_YAFFS_TNODE_LIST_DEBUG
-	yaffs_CheckStruct(yaffs_Tnode, 2 * YAFFS_NTNODES_LEVEL0, "yaffs_Tnode");
+/*	yaffs_CheckStruct(yaffs_Tnode, 2 * YAFFS_NTNODES_LEVEL0, "yaffs_Tnode"); */
 #endif
 #ifndef CONFIG_YAFFS_WINCE
 	yaffs_CheckStruct(yaffs_ObjectHeader, 512, "yaffs_ObjectHeader");