Mercurial > yaffs-ecoscentric

changeset 272:c3d9f3254599

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Change string concats to work with all OSs
author charles
date Tue, 27 Jan 2009 02:52:45 +0000
parents cc8ad75dac73
children 8605e62d8ed0
files yaffs_guts.c yportenv.h
diffstat 2 files changed, 17 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/yaffs_guts.c
+++ b/yaffs_guts.c
@@ -1051,7 +1051,7 @@ static void yaffs_RetireBlock(yaffs_Devi
 			if (dev->writeChunkWithTagsToNAND(dev, chunkId -
 			    dev->chunkOffset, buffer, &tags) != YAFFS_OK)
 				T(YAFFS_TRACE_ALWAYS, (TSTR("yaffs: Failed to "
-					"write bad block marker to block %d"
+					TCONT("write bad block marker to block %d")
 					TENDSTR), blockInNAND));
 
 			yaffs_ReleaseTempBuffer(dev, buffer, __LINE__);
@@ -3717,8 +3717,8 @@ static int yaffs_WriteChunkDataToObject(
 	if(nBytes < 1 || nBytes > dev->totalBytesPerChunk){
 	  T(YAFFS_TRACE_ERROR,
 	  (TSTR("Writing %d bytes to chunk!!!!!!!!!" TENDSTR), nBytes));
-	  while(1){}
-        }
+	  YBUG();
+     }
 	
 	
 
@@ -4325,7 +4325,7 @@ static int yaffs_CheckpointObjectToObjec
 
 	if (obj->variantType != cp->variantType) {
 		T(YAFFS_TRACE_ERROR,(TSTR("Checkpoint read object %d type %d "
-			"chunk %d does not match existing object type %d"
+			TCONT("chunk %d does not match existing object type %d")
 			TENDSTR), cp->objectId, cp->variantType, cp->hdrChunk,
 			obj->variantType));
 		return 0;
@@ -4343,7 +4343,9 @@ static int yaffs_CheckpointObjectToObjec
 		
 	if(parent) {
 		if (parent->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) {
-			T(YAFFS_TRACE_ALWAYS,(TSTR("Checkpoint read object %d parent %d type %d chunk %d Parent type, %d, not directory"TENDSTR),
+			T(YAFFS_TRACE_ALWAYS,(TSTR("Checkpoint read object %d parent %d type %d"
+				TCONT(" chunk %d Parent type, %d, not directory")
+				TENDSTR),
 				cp->objectId,cp->parentId,cp->variantType,cp->hdrChunk,parent->variantType));
 			return 0;
 		}
@@ -4871,8 +4873,10 @@ int yaffs_WriteDataToFile(yaffs_Object *
 		
 		if(chunk * dev->nDataBytesPerChunk + start != offset ||
 		   start >= dev->nDataBytesPerChunk){
-		   T(YAFFS_TRACE_ERROR,(TSTR("AddrToChunk of offset %d gives chunk %d start %d"TENDSTR),
-		   			(int)offset, chunk,start));
+		   T(YAFFS_TRACE_ERROR,(
+			   TSTR("AddrToChunk of offset %d gives chunk %d start %d"
+			   TENDSTR),
+		   	   (int)offset, chunk,start));
 		}
 		chunk++;
 
@@ -6461,10 +6465,11 @@ static int yaffs_ScanBackwards(yaffs_Dev
 
 				if (!in->valid && in->variantType !=
 				    (oh ? oh->type : tags.extraObjectType))
-					T(YAFFS_TRACE_ERROR, (TSTR
-					   ("yaffs tragedy: Bad object type, "
-					    "%d != %d, for object %d at chunk "
-					    "%d during scan" TENDSTR), oh ?
+					T(YAFFS_TRACE_ERROR, (
+						TSTR("yaffs tragedy: Bad object type, "
+					    TCONT("%d != %d, for object %d at chunk ")
+					    TCONT("%d during scan")
+						TENDSTR), oh ?
 					    oh->type : tags.extraObjectType,
 					    in->variantType, tags.objectId,
 					    chunk));
--- a/yportenv.h
+++ b/yportenv.h
@@ -90,6 +90,7 @@
 
 #define TENDSTR "\n"
 #define TSTR(x) KERN_WARNING x
+#define TCONT(x) x
 #define TOUT(p) printk p
 
 #define yaffs_trace(mask, fmt, args...) \