Remove sprintf from yaffs_guts because it isn't always available

[yaffs2.git] / yaffs_guts.c

diff --git a/yaffs_guts.c b/yaffs_guts.c
index a16ec55075ef88df2fdd68310cda6534756e532b..c74e25ed68bf4e9846aaecc181c5f5a937032726 100644 (file)
--- a/yaffs_guts.c
+++ b/yaffs_guts.c
@@ -12,7 +12,7 @@
  */
 
 const char *yaffs_guts_c_version =
-    "$Id: yaffs_guts.c,v 1.62 2008-11-07 00:32:20 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;
@@ -5744,6 +5744,7 @@ static int yaffs_Scan(yaffs_Device * dev)
                                        in->yst_rdev = oh->yst_rdev;
 #endif
                                        in->hdrChunk = chunk;
+                                       in->serial = tags.serialNumber;
 
                                } else if (in && !in->valid) {
                                        /* we need to load this info */
@@ -5768,6 +5769,7 @@ static int yaffs_Scan(yaffs_Device * dev)
                                        in->yst_rdev = oh->yst_rdev;
 #endif
                                        in->hdrChunk = chunk;
+                                       in->serial = tags.serialNumber;
 
                                        yaffs_SetObjectName(in, oh->name);
                                        in->dirty = 0;
@@ -6941,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);
 
        }