diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2001-12-16 23:23:37 -0500 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2001-12-16 23:23:37 -0500 |
| commit | 4ea7bd04390935e1f8b473c8b857e518df2e226b (patch) | |
| tree | 522193270e7d1c89b7bacc8a7df6486dcccaf82d /debugfs/logdump.c | |
| parent | 8cf93332d180e6929d73cd8c855c3a83d6a6648c (diff) | |
| download | android_external_e2fsprogs-4ea7bd04390935e1f8b473c8b857e518df2e226b.tar.gz android_external_e2fsprogs-4ea7bd04390935e1f8b473c8b857e518df2e226b.tar.bz2 android_external_e2fsprogs-4ea7bd04390935e1f8b473c8b857e518df2e226b.zip | |
Fix various gcc -Wall nits. Fixed a bug in mke2fs where a bogus
error message could be printed on an malloc() failure, and e2image
was optimized to avoid needless system calls by using the stashed
inode functions.
Diffstat (limited to 'debugfs/logdump.c')
| -rw-r--r-- | debugfs/logdump.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/debugfs/logdump.c b/debugfs/logdump.c index 0102c248..34552d01 100644 --- a/debugfs/logdump.c +++ b/debugfs/logdump.c @@ -34,6 +34,7 @@ extern int optreset; /* defined by BSD, but not others */ #include "debugfs.h" #include "jfs_user.h" +#include <uuid/uuid.h> enum journal_location {JOURNAL_IS_INTERNAL, JOURNAL_IS_EXTERNAL}; @@ -342,13 +343,13 @@ static void dump_journal(char *cmdname, FILE *out_file, (sb->s_feature_incompat & EXT3_FEATURE_INCOMPAT_JOURNAL_DEV)) { blocksize = EXT2_BLOCK_SIZE(sb); blocknr = (blocksize == 1024) ? 2 : 1; - uuid_unparse(&sb->s_uuid, jsb_buffer); + uuid_unparse(sb->s_uuid, jsb_buffer); fprintf(out_file, "Ext2 superblock header found.\n"); if (dump_all) { fprintf(out_file, "\tuuid=%s\n", jsb_buffer); fprintf(out_file, "\tblocksize=%d\n", blocksize); fprintf(out_file, "\tjournal data size %ld\n", - sb->s_blocks_count); + (long) sb->s_blocks_count); } } |