X-Git-Url: https://yaffs.net/gitweb/?a=blobdiff_plain;f=direct%2Fyaffs_nandif.c;h=e58516aa60e053732f52adea56f0f25be26f193d;hb=refs%2Fheads%2Fcase-insensitive;hp=e103757f12fe36316ca477dbc237d065a859e56c;hpb=d223baa0fa5644b48c2626f8d42b05ac45b1daf6;p=yaffs2.git

diff --git a/direct/yaffs_nandif.c b/direct/yaffs_nandif.c
index e103757..e58516a 100644
--- a/direct/yaffs_nandif.c
+++ b/direct/yaffs_nandif.c
@@ -1,7 +1,7 @@
 /*
  * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
  *
- * Copyright (C) 2002-2010 Aleph One Ltd.
+ * Copyright (C) 2002-2011 Aleph One Ltd.
  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>
@@ -92,7 +92,7 @@ int ynandif_ReadChunkWithTagsFromNAND(struct yaffs_dev * dev, int nand_chunk,
 		
 		if(!data) {
 			localData = 1;
-			data = yaffs_get_temp_buffer(dev,__LINE__);
+			data = yaffs_get_temp_buffer(dev);
 		}
 		spare = NULL;
 		spareSize = 0;
@@ -133,7 +133,7 @@ int ynandif_ReadChunkWithTagsFromNAND(struct yaffs_dev * dev, int nand_chunk,
 	}
 
 	if(localData)
-		yaffs_release_temp_buffer(dev,data,__LINE__);
+		yaffs_release_temp_buffer(dev, data);
 	
 	return retval;
 }
@@ -184,7 +184,7 @@ int ynandif_QueryNANDBlock(struct yaffs_dev *dev, int blockId,
 		}
 		else 
 		{
-			*state = YAFFS_BLOCK_STATE_NEEDS_SCANNING;
+			*state = YAFFS_BLOCK_STATE_NEEDS_SCAN;
 			*seq_number = tags.seq_number;
 		}
 	}
@@ -216,12 +216,12 @@ struct yaffs_dev *
 	yaffs_add_dev_from_geometry(const YCHAR *name,
 					const ynandif_Geometry *geometry)
 {
-	YCHAR *clonedName = malloc(sizeof(YCHAR) * (strnlen(name,YAFFS_MAX_NAME_LENGTH)+1));
+	YCHAR *clonedName = malloc(sizeof(YCHAR) * (yaffs_strnlen(name,YAFFS_MAX_NAME_LENGTH)+1));
 	struct yaffs_dev *dev = malloc(sizeof(struct yaffs_dev));
 
 	if(dev && clonedName){
 		memset(dev,0,sizeof(struct yaffs_dev));
-		strcpy(clonedName,name);
+		yaffs_strcpy(clonedName,name);
 
 		dev->param.name = clonedName;
 		dev->param.write_chunk_tags_fn = ynandif_WriteChunkWithTagsToNAND;