[PATCH 4/8] nandtest: change flash length variable type

Alexander Aring alex.aring at googlemail.com
Mon Oct 22 03:23:28 EDT 2012


Change flash 'length' variable type to off_t instead of int.

Signed-off-by: Alexander Aring <alex.aring at gmail.com>
---
 commands/nandtest.c | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/commands/nandtest.c b/commands/nandtest.c
index 656fb65..e25f062 100644
--- a/commands/nandtest.c
+++ b/commands/nandtest.c
@@ -195,9 +195,8 @@ static void print_stats(int nr_passes, int length)
 /* Main program. */
 static int do_nandtest(int argc, char *argv[])
 {
-	int opt, length = -1, do_nandtest_dev = -1;
-	off_t flash_offset = 0;
-	off_t test_ofs;
+	int opt, do_nandtest_dev = -1;
+	off_t flash_offset = 0, test_ofs, length = 0;
 	unsigned int nr_iterations = 1, iter;
 	int i;
 	int ret = -1;
@@ -272,7 +271,7 @@ static int do_nandtest(int argc, char *argv[])
 		goto err;
 	}
 
-	if (length == -1) {
+	if (!length) {
 		length = meminfo.size;
 		length -= flash_offset;
 	}
@@ -292,13 +291,13 @@ static int do_nandtest(int argc, char *argv[])
 	}
 	if (length % meminfo.erasesize) {
 		printf("Length 0x%08x not multiple of erase size 0x%08x\n",
-			length, meminfo.erasesize);
+			(unsigned)length, meminfo.erasesize);
 		goto err;
 	}
 	if (length + flash_offset > meminfo.size) {
 		printf("Length 0x%08x + offset 0x%08x exceeds "
-				"device size 0x%08x\n",
-			length, (unsigned)flash_offset, meminfo.size);
+				"device size 0x%08x\n", (unsigned)length,
+				(unsigned)flash_offset, meminfo.size);
 		goto err;
 	}
 
-- 
1.7.12.4




More information about the barebox mailing list