fs-tests: integck: fix placeholders when printing

There is a lot of code where %u is used for printing off_t variables,
which may be actually 64-bit wide. Fix this by using %llu.

Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>

diff --git a/tests/fs-tests/integrity/integck.c b/tests/fs-tests/integrity/integck.c
index 3b28e99468b75baf7f13972a95d6f2dfc2eef918..f2223d424544f43914da45f87537d662168b2a3b 100644 (file)
--- a/tests/fs-tests/integrity/integck.c
+++ b/tests/fs-tests/integrity/integck.c
@@ -679,7 +679,7 @@ static void file_info_display(struct file_info *file)
                normsg("      Directory: %s", entry->parent->name);
                entry = entry->next_link;
        }
-       normsg("    Length: %u", (unsigned int)file->length);
+       normsg("    Length: %llu", (unsigned long long)file->length);
        normsg("    File was open: %s",
               (file->fds == NULL) ? "false" : "true");
        normsg("    File was deleted: %s",
@@ -690,10 +690,10 @@ static void file_info_display(struct file_info *file)
        wcnt = 0;
        w = file->writes;
        while (w) {
-               normsg("        Offset: %u  Size: %u  Seed: %u  R.Off: %u",
-                      (unsigned int)w->offset, (unsigned int)w->size,
-                      (unsigned int)w->random_seed,
-                      (unsigned int)w->random_offset);
+               normsg("        Offset: %llu  Size: %zu  Seed: %llu  R.Off: %llu",
+                      (unsigned long long)w->offset, w->size,
+                      (unsigned long long)w->random_seed,
+                      (unsigned long long)w->random_offset);
                wcnt += 1;
                w = w->next;
        }
@@ -704,12 +704,14 @@ static void file_info_display(struct file_info *file)
        w = file->raw_writes;
        while (w) {
                if (is_truncation(w))
-                       normsg("        Trunc from %u to %u",
-                              (unsigned int)w->offset, (unsigned int)w->new_length);
+                       normsg("        Trunc from %llu to %llu",
+                              (unsigned long long)w->offset,
+                              (unsigned long long)w->new_length);
                else
-                       normsg("        Offset: %u  Size: %u  Seed: %u  R.Off: %u",
-                              (unsigned int)w->offset, (unsigned int)w->size,
-                              (unsigned int)w->random_seed, (unsigned int)w->random_offset);
+                       normsg("        Offset: %llu  Size: %zu  Seed: %llu  R.Off: %llu",
+                              (unsigned long long)w->offset, w->size,
+                              (unsigned long long)w->random_seed,
+                              (unsigned long long)w->random_offset);
                wcnt += 1;
                w = w->next;
        }
@@ -1257,10 +1259,9 @@ static void file_check_hole(struct file_info *file, int fd, off_t offset,
                CHECK(read(fd, buf, block) == block);
                for (i = 0; i < block; ++i) {
                        if (buf[i] != 0) {
-                               errmsg("file_check_hole failed at %u checking "
-                                      "hole at %u size %u",
-                                      (unsigned int)(size - remains + i),
-                                      (unsigned int)offset, (unsigned int)size);
+                               errmsg("file_check_hole failed at %zu checking "
+                                      "hole at %llu size %zu", size - remains + i,
+                                      (unsigned long long)offset, size);
                                file_info_display(file);
                                save_file(fd, file);
                        }
@@ -1291,10 +1292,9 @@ static void file_check_data(struct file_info *file, int fd,
                for (i = 0; i < block; ++i) {
                        char c = (char)rand();
                        if (buf[i] != c) {
-                               errmsg("file_check_data failed at %u checking "
-                                      "data at %u size %u",
-                                       (unsigned int)(w->size - remains + i),
-                                       (unsigned int)w->offset, (unsigned int)w->size);
+                               errmsg("file_check_data failed at %zu checking "
+                                      "data at %llu size %zu", w->size - remains + i,
+                                       (unsigned long long)w->offset, w->size);
                                file_info_display(file);
                                save_file(fd, file);
                        }
@@ -1331,8 +1331,8 @@ static void file_check(struct file_info *file, int fd)
        /* Check length */
        pos = lseek(fd, 0, SEEK_END);
        if (pos != file->length) {
-               errmsg("file_check failed checking length expected %u actual %u\n",
-                      (unsigned int)file->length, (unsigned int)pos);
+               errmsg("file_check failed checking length expected %llu actual %llu\n",
+                      (unsigned long long)file->length, (unsigned long long)pos);
                file_info_display(file);
                save_file(fd, file);
        }