diff options
Diffstat (limited to 'e2fsck')
| -rw-r--r-- | e2fsck/ChangeLog | 3 | ||||
| -rw-r--r-- | e2fsck/message.c | 10 |
2 files changed, 8 insertions, 5 deletions
diff --git a/e2fsck/ChangeLog b/e2fsck/ChangeLog index 505be1b3..bbd23ada 100644 --- a/e2fsck/ChangeLog +++ b/e2fsck/ChangeLog @@ -1,5 +1,8 @@ 2007-05-22 Theodore Tso <tytso@mit.edu> + * message.c (expand_inode_expression, expand_percent_expression): + Fix gcc -Wall warnings on 64-bit systems. + * pass1.c (e2fsck_pass1_check_device_inode): Mark the fs parameter as unused. (e2fsck_setup_tdb_icount): Use profile_get_uint() function diff --git a/e2fsck/message.c b/e2fsck/message.c index 5cf126cb..22c71631 100644 --- 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: |