summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--misc-utils/flashcp.c8
-rw-r--r--tests/ubi-tests/io_paral.c4
-rw-r--r--tests/ubi-tests/io_read.c2
-rw-r--r--tests/ubi-tests/io_update.c4
4 files changed, 9 insertions, 9 deletions
diff --git a/misc-utils/flashcp.c b/misc-utils/flashcp.c
index b6ad2f9..d7b0a59 100644
--- a/misc-utils/flashcp.c
+++ b/misc-utils/flashcp.c
@@ -337,12 +337,12 @@ int main (int argc,char *argv[])
if (result < 0)
{
log_printf (LOG_ERROR,
- "While writing data to 0x%.8x-0x%.8x on %s: %m\n",
+ "While writing data to 0x%.8lx-0x%.8lx on %s: %m\n",
written,written + i,device);
exit (EXIT_FAILURE);
}
log_printf (LOG_ERROR,
- "Short write count returned while writing to x%.8x-0x%.8x on %s: %d/%llu bytes written to flash\n",
+ "Short write count returned while writing to x%.8zx-0x%.8zx on %s: %zu/%llu bytes written to flash\n",
written,written + i,device,written + result,(unsigned long long)filestat.st_size);
exit (EXIT_FAILURE);
}
@@ -372,7 +372,7 @@ int main (int argc,char *argv[])
if (size < BUFSIZE) i = size;
if (flags & FLAG_VERBOSE)
log_printf (LOG_NORMAL,
- "\rVerifying data: %dk/%lluk (%llu%%)",
+ "\rVerifying data: %luk/%lluk (%llu%%)",
KB (written + i),
KB ((unsigned long long)filestat.st_size),
PERCENTAGE (written + i,(unsigned long long)filestat.st_size));
@@ -387,7 +387,7 @@ int main (int argc,char *argv[])
if (memcmp (src,dest,i))
{
log_printf (LOG_ERROR,
- "File does not seem to match flash data. First mismatch at 0x%.8x-0x%.8x\n",
+ "File does not seem to match flash data. First mismatch at 0x%.8zx-0x%.8zx\n",
written,written + i);
exit (EXIT_FAILURE);
}
diff --git a/tests/ubi-tests/io_paral.c b/tests/ubi-tests/io_paral.c
index 4040b3e..b0884fe 100644
--- a/tests/ubi-tests/io_paral.c
+++ b/tests/ubi-tests/io_paral.c
@@ -207,7 +207,7 @@ static void *write_thread(void *ptr)
ret = pwrite(fd, wbuf, dev_info.leb_size, offs);
if (ret != dev_info.leb_size) {
failed("pwrite");
- errorm("cannot write %d bytes to offs %lld, wrote %d",
+ errorm("cannot write %d bytes to offs %ld, wrote %d",
dev_info.leb_size, offs, ret);
break;
}
@@ -216,7 +216,7 @@ static void *write_thread(void *ptr)
ret = pread(fd, rbuf, dev_info.leb_size, offs);
if (ret != dev_info.leb_size) {
failed("read");
- errorm("failed to read %d bytes at offset %d "
+ errorm("failed to read %d bytes at offset %ld "
"of volume %d", dev_info.leb_size, offs,
vol_id);
break;
diff --git a/tests/ubi-tests/io_read.c b/tests/ubi-tests/io_read.c
index f944a86..a6cc8f5 100644
--- a/tests/ubi-tests/io_read.c
+++ b/tests/ubi-tests/io_read.c
@@ -233,7 +233,7 @@ static int test_read2(const struct ubi_vol_info *vol_info, int len)
continue;
if (test_read3(vol_info, len, offsets[i])) {
- errorm("offset = %d", offsets[i]);
+ errorm("offset = %ld", offsets[i]);
return -1;
}
}
diff --git a/tests/ubi-tests/io_update.c b/tests/ubi-tests/io_update.c
index f48df1d..d093da5 100644
--- a/tests/ubi-tests/io_update.c
+++ b/tests/ubi-tests/io_update.c
@@ -189,11 +189,11 @@ static int test_update1(struct ubi_vol_info *vol_info, int leb_change)
ret = read(fd, buf1, test_len);
if (ret < 0) {
failed("read");
- errorm("failed to read %d bytes", test_len);
+ errorm("failed to read %lld bytes", test_len);
goto close;
}
if (ret != test_len) {
- errorm("failed to read %d bytes, read %d", test_len, ret);
+ errorm("failed to read %lld bytes, read %d", test_len, ret);
goto close;
}
if (memcmp(buf, buf1, test_len)) {