From d73400d6ec870b2651b135e75352466e09c2a17f Mon Sep 17 00:00:00 2001 From: Andy Shevchenko Date: Wed, 20 Apr 2011 12:35:08 +0300 Subject: mkfs.jffs2: fix casting of __off64_t The casting of __off64_t to unsigned long potentially wrong for values higher than ULONG_MAX. Let's fix that by using PRIu64 classifier. Signed-off-by: Andy Shevchenko Acked-by: Mike Frysinger Signed-off-by: Artem Bityutskiy --- mkfs.jffs2.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) (limited to 'mkfs.jffs2.c') diff --git a/mkfs.jffs2.c b/mkfs.jffs2.c index 7bb9ad1..7abaf50 100644 --- a/mkfs.jffs2.c +++ b/mkfs.jffs2.c @@ -72,8 +72,9 @@ #endif #include #include -#include "rbtree.h" +#include +#include "rbtree.h" #include "common.h" /* Do not use the weird XPG version of basename */ @@ -1232,8 +1233,8 @@ static void recursive_populate_directory(struct filesystem_entry *dir) } else switch (e->sb.st_mode & S_IFMT) { case S_IFDIR: if (verbose) { - printf("\td %04o %9lu %5d:%-3d %s\n", - e->sb.st_mode & ~S_IFMT, (unsigned long) e->sb.st_size, + printf("\td %04o %9" PRIu64 " %5d:%-3d %s\n", + e->sb.st_mode & ~S_IFMT, e->sb.st_size, (int) (e->sb.st_uid), (int) (e->sb.st_gid), e->name); } @@ -1242,8 +1243,8 @@ static void recursive_populate_directory(struct filesystem_entry *dir) break; case S_IFSOCK: if (verbose) { - printf("\ts %04o %9lu %5d:%-3d %s\n", - e->sb.st_mode & ~S_IFMT, (unsigned long) e->sb.st_size, + printf("\ts %04o %9" PRIu64 " %5d:%-3d %s\n", + e->sb.st_mode & ~S_IFMT, e->sb.st_size, (int) e->sb.st_uid, (int) e->sb.st_gid, e->name); } write_pipe(e); @@ -1251,8 +1252,8 @@ static void recursive_populate_directory(struct filesystem_entry *dir) break; case S_IFIFO: if (verbose) { - printf("\tp %04o %9lu %5d:%-3d %s\n", - e->sb.st_mode & ~S_IFMT, (unsigned long) e->sb.st_size, + printf("\tp %04o %9" PRIu64 " %5d:%-3d %s\n", + e->sb.st_mode & ~S_IFMT, e->sb.st_size, (int) e->sb.st_uid, (int) e->sb.st_gid, e->name); } write_pipe(e); @@ -1280,8 +1281,8 @@ static void recursive_populate_directory(struct filesystem_entry *dir) break; case S_IFLNK: if (verbose) { - printf("\tl %04o %9lu %5d:%-3d %s -> %s\n", - e->sb.st_mode & ~S_IFMT, (unsigned long) e->sb.st_size, + printf("\tl %04o %9" PRIu64 " %5d:%-3d %s -> %s\n", + e->sb.st_mode & ~S_IFMT, e->sb.st_size, (int) e->sb.st_uid, (int) e->sb.st_gid, e->name, e->link); } @@ -1292,9 +1293,9 @@ static void recursive_populate_directory(struct filesystem_entry *dir) wrote = write_regular_file(e); write_xattr_entry(e); if (verbose) { - printf("\tf %04o %9lu (%9u) %5d:%-3d %s\n", - e->sb.st_mode & ~S_IFMT, (unsigned long) e->sb.st_size, - wrote, (int) e->sb.st_uid, (int) e->sb.st_gid, e->name); + printf("\tf %04o %9" PRIu64 " (%9u) %5d:%-3d %s\n", + e->sb.st_mode & ~S_IFMT, e->sb.st_size, wrote, + (int) e->sb.st_uid, (int) e->sb.st_gid, e->name); } break; default: -- cgit v1.2.3