Fix gcc -Wall warnings, especially on 64-bit systems

[thirdparty/e2fsprogs.git] / e2fsck / message.c

diff --git a/e2fsck/message.c b/e2fsck/message.c
index 5cf126cb9bb377d79b87ccd39a251884ebfd781a..22c71631ac79f29494a03e11f55345faec9d8bf1 100644 (file)
--- a/e2fsck/message.c
+++ b/e2fsck/message.c
@@ -264,8 +264,8 @@ static _INLINE_ void expand_inode_expression(char ch,
                        else
                                printf("%u", inode->i_size);
 #else
-                       printf("%llu", (inode->i_size | 
-                                       ((__u64) inode->i_size_high << 32)));
+                       printf("%llu", inode->i_size |
+                                      ((long long)inode->i_size_high << 32));
 #endif
                }
                break;
@@ -394,7 +394,7 @@ static _INLINE_ void expand_percent_expression(ext2_filsys fs, char ch,
 #ifdef EXT2_NO_64_TYPE
                printf("%d", ctx->blkcount);
 #else
-               printf("%lld", ctx->blkcount);
+               printf("%lld", (long long)ctx->blkcount);
 #endif
                break;
        case 'c':
@@ -419,7 +419,7 @@ static _INLINE_ void expand_percent_expression(ext2_filsys fs, char ch,
 #ifdef EXT2_NO_64_TYPE
                printf("%u", ctx->num);
 #else
-               printf("%llu", ctx->num);
+               printf("%llu", (long long)ctx->num);
 #endif
                break;
        case 'p':
@@ -445,7 +445,7 @@ static _INLINE_ void expand_percent_expression(ext2_filsys fs, char ch,
 #ifdef EXT2_NO_64_TYPE
                printf("0x%x", ctx->num);
 #else
-               printf("0x%llx", ctx->num);
+               printf("0x%llx", (long long)ctx->num);
 #endif
                break;
        default: