mtd-utils: Fix printf format specifiers with the wrong type

Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>

diff --git a/misc-utils/flashcp.c b/misc-utils/flashcp.c
index b6ad2f9be9c3c673b3e2a2dad957bb1cf88a4e7d..d7b0a5943bc03c40e76b53c5752b06e8b236a6c3 100644 (file)
--- 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 4040b3eca2553da3fef99d326f130fd66166c7a5..b0884fe7146a890605463d5e4135adfa6bd22be1 100644 (file)
--- 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 f944a8658d281b05b64c7412e9cfe45decf149a1..a6cc8f5bca6b48600011efc8cd0c9ade505b69ac 100644 (file)
--- 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 f48df1dbe719c7de3da3b550c06434822c8ec607..d093da5bc1a103401700cd5e209087bf1bc2d060 100644 (file)
--- 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)) {