X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=yaffs_yaffs1.c;h=3acb1d2be92483e672540e427313cd190e82cdd0;hp=cc717461c66c3887590c9efb66189faa14e87a1b;hb=976dbeae825b18e6759f3903073a6784248cc244;hpb=f43976eda35065890e7cf0a008e9518158eb71d6

diff --git a/yaffs_yaffs1.c b/yaffs_yaffs1.c
index cc71746..3acb1d2 100644
--- a/yaffs_yaffs1.c
+++ b/yaffs_yaffs1.c
@@ -10,6 +10,7 @@
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
  */
+
 #include "yaffs_yaffs1.h"
 #include "yportenv.h"
 #include "yaffs_trace.h"
@@ -18,32 +19,29 @@
 #include "yaffs_nand.h"
 
 
-int yaffs1_scan(yaffs_dev_t *dev)
+int yaffs1_scan(struct yaffs_dev *dev)
 {
-	yaffs_ext_tags tags;
+	struct yaffs_ext_tags tags;
 	int blk;
-	int blockIterator;
-	int startIterator;
-	int endIterator;
 	int result;
 
 	int chunk;
 	int c;
 	int deleted;
 	yaffs_block_state_t state;
-	yaffs_obj_t *hard_list = NULL;
+	struct yaffs_obj *hard_list = NULL;
 	yaffs_block_info_t *bi;
-	__u32 seq_number;
-	yaffs_obj_header *oh;
-	yaffs_obj_t *in;
-	yaffs_obj_t *parent;
+	u32 seq_number;
+	struct yaffs_obj_hdr *oh;
+	struct yaffs_obj *in;
+	struct yaffs_obj *parent;
 
 	int alloc_failed = 0;
 
-	struct yaffs_shadow_fixer_s *shadowFixerList = NULL;
+	struct yaffs_shadow_fixer_s *shadow_fixers = NULL;
 
 
-	__u8 *chunkData;
+	u8 *chunk_data;
 
 
 
@@ -51,7 +49,7 @@ int yaffs1_scan(yaffs_dev_t *dev)
 	  (TSTR("yaffs1_scan starts  intstartblk %d intendblk %d..." TENDSTR),
 	   dev->internal_start_block, dev->internal_end_block));
 
-	chunkData = yaffs_get_temp_buffer(dev, __LINE__);
+	chunk_data = yaffs_get_temp_buffer(dev, __LINE__);
 
 	dev->seq_number = YAFFS_LOWEST_SEQUENCE_NUMBER;
 
@@ -86,19 +84,13 @@ int yaffs1_scan(yaffs_dev_t *dev)
 		bi++;
 	}
 
-	startIterator = dev->internal_start_block;
-	endIterator = dev->internal_end_block;
-
 	/* For each block.... */
-	for (blockIterator = startIterator; !alloc_failed && blockIterator <= endIterator;
-	     blockIterator++) {
+	for (blk= dev->internal_start_block; 
+		!alloc_failed && blk <= dev->internal_end_block;
+		blk++) {
 
 		YYIELD();
 
-		YYIELD();
-
-		blk = blockIterator;
-
 		bi = yaffs_get_block_info(dev, blk);
 		state = bi->block_state;
 
@@ -196,10 +188,10 @@ int yaffs1_scan(yaffs_dev_t *dev)
 				bi->pages_in_use++;
 
 				result = yaffs_rd_chunk_tags_nand(dev, chunk,
-								chunkData,
+								chunk_data,
 								NULL);
 
-				oh = (yaffs_obj_header *) chunkData;
+				oh = (struct yaffs_obj_hdr *) chunk_data;
 
 				in = yaffs_find_by_number(dev,
 							      tags.obj_id);
@@ -227,8 +219,8 @@ int yaffs1_scan(yaffs_dev_t *dev)
 					struct yaffs_shadow_fixer_s *fixer;
 					fixer = YMALLOC(sizeof(struct yaffs_shadow_fixer_s));
 					if (fixer) {
-						fixer->next = shadowFixerList;
-						shadowFixerList = fixer;
+						fixer->next = shadow_fixers;
+						shadow_fixers = fixer;
 						fixer->obj_id = tags.obj_id;
 						fixer->shadowed_id = oh->shadows_obj;
 						T(YAFFS_TRACE_SCAN,
@@ -243,10 +235,10 @@ int yaffs1_scan(yaffs_dev_t *dev)
 				if (in && in->valid) {
 					/* We have already filled this one. We have a duplicate and need to resolve it. */
 
-					unsigned existingSerial = in->serial;
-					unsigned newSerial = tags.serial_number;
+					unsigned existing_serial = in->serial;
+					unsigned new_serial = tags.serial_number;
 
-					if (((existingSerial + 1) & 3) == newSerial) {
+					if (((existing_serial + 1) & 3) == new_serial) {
 						/* Use new one - destroy the exisiting one */
 						yaffs_chunk_del(dev,
 								  in->hdr_chunk,
@@ -431,11 +423,11 @@ int yaffs1_scan(yaffs_dev_t *dev)
 	/* Fix up any shadowed objects */
 	{
 		struct yaffs_shadow_fixer_s *fixer;
-		yaffs_obj_t *obj;
+		struct yaffs_obj *obj;
 
-		while (shadowFixerList) {
-			fixer = shadowFixerList;
-			shadowFixerList = fixer->next;
+		while (shadow_fixers) {
+			fixer = shadow_fixers;
+			shadow_fixers = fixer->next;
 			/* Complete the rename transaction by deleting the shadowed object
 			 * then setting the object header to unshadowed.
 			 */
@@ -452,7 +444,7 @@ int yaffs1_scan(yaffs_dev_t *dev)
 		}
 	}
 
-	yaffs_release_temp_buffer(dev, chunkData, __LINE__);
+	yaffs_release_temp_buffer(dev, chunk_data, __LINE__);
 
 	if (alloc_failed)
 		return YAFFS_FAIL;