summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Aring <alex.aring@googlemail.com>2012-10-22 09:23:28 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2012-10-23 08:27:33 +0200
commitbada8f57a6d9ffbda76dcc77263ed49a18eecdbb (patch)
tree45bbea9497cd53c65fdfa56dae956f76dde1e50b
parentf221939b5d6946a4f6fbc551f736fc5a9c9fad86 (diff)
downloadbarebox-bada8f57a6d9ffbda76dcc77263ed49a18eecdbb.tar.gz
barebox-bada8f57a6d9ffbda76dcc77263ed49a18eecdbb.tar.xz
nandtest: change flash length variable type
Change flash 'length' variable type to off_t instead of int. Signed-off-by: Alexander Aring <alex.aring@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r--commands/nandtest.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/commands/nandtest.c b/commands/nandtest.c
index 656fb65833..e25f0629df 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;
}