X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=yaffs_guts.c;h=c74e25ed68bf4e9846aaecc181c5f5a937032726;hp=a6775a9498cae9e6870a83df509c2fd32fb61b9b;hb=fc8acddcc3540df0d9c03c3a955d5ccd5877635d;hpb=3b6c99b4d21c4ff4bbc9aed65a71868ab6a0dc46

diff --git a/yaffs_guts.c b/yaffs_guts.c
index a6775a9..c74e25e 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.63 2008-11-21 02:17:32 charles Exp $";
+    "$Id: yaffs_guts.c,v 1.65 2008-11-26 20:42:04 charles Exp $";
 
 #include "yportenv.h"
 
@@ -3148,7 +3148,7 @@ static int yaffs_GarbageCollectBlock(yaffs_Device * dev, int block)
 						yaffs_ObjectHeader *oh;
 						oh = (yaffs_ObjectHeader *)buffer;
 						oh->isShrink = 0;
-						oh->shadowsObject = oh->inbandShadowsObject = -1;
+/*						oh->shadowsObject = oh->inbandShadowsObject = -1; */
 						tags.extraShadows = 0;
 						tags.extraIsShrinkHeader = 0;
 						
@@ -4868,7 +4868,7 @@ int yaffs_WriteDataToFile(yaffs_Object * in, const __u8 * buffer, loff_t offset,
 
 			nToWriteBack =
 			    (nBytesRead >
-			     (start + n)) ? nBytesRead : (start + n);
+			     ((int)start + n)) ? nBytesRead : (start + n);
 
 		} else {
 			nToCopy = dev->nDataBytesPerChunk - start;
@@ -6943,9 +6943,18 @@ int yaffs_GetObjectName(yaffs_Object * obj, YCHAR * name, int buffSize)
 		yaffs_strncpy(name, YAFFS_LOSTNFOUND_NAME, buffSize - 1);
 	} else if (obj->hdrChunk <= 0) {
 		YCHAR locName[20];
+		YCHAR numString[20];
+		YCHAR *x = &numString[19];
+		unsigned v = obj->objectId;
+		numString[19] = 0;
+		while(v>0){
+			x--;
+			*x = '0' + (v % 10);
+			v /= 10;
+		}
 		/* make up a name */
-		yaffs_sprintf(locName, _Y("%s%d"), YAFFS_LOSTNFOUND_PREFIX,
-			      obj->objectId);
+		yaffs_strcpy(locName, YAFFS_LOSTNFOUND_PREFIX);
+		yaffs_strcat(locName,x);
 		yaffs_strncpy(name, locName, buffSize - 1);
 
 	}