diff options
Diffstat (limited to 'e2fsprogs/old_e2fsprogs/e2fsck.c')
-rw-r--r-- | e2fsprogs/old_e2fsprogs/e2fsck.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/e2fsprogs/old_e2fsprogs/e2fsck.c b/e2fsprogs/old_e2fsprogs/e2fsck.c index 373e8ce91..8400a92ce 100644 --- a/e2fsprogs/old_e2fsprogs/e2fsck.c +++ b/e2fsprogs/old_e2fsprogs/e2fsck.c | |||
@@ -1050,7 +1050,7 @@ static errcode_t ea_refcount_create(int size, ext2_refcount_t *ret) | |||
1050 | refcount->size = size; | 1050 | refcount->size = size; |
1051 | bytes = (size_t) (size * sizeof(struct ea_refcount_el)); | 1051 | bytes = (size_t) (size * sizeof(struct ea_refcount_el)); |
1052 | #ifdef DEBUG | 1052 | #ifdef DEBUG |
1053 | printf("Refcount allocated %d entries, %d bytes.\n", | 1053 | printf("Refcount allocated %d entries, %lu bytes.\n", |
1054 | refcount->size, bytes); | 1054 | refcount->size, bytes); |
1055 | #endif | 1055 | #endif |
1056 | retval = ext2fs_get_mem(bytes, &refcount->list); | 1056 | retval = ext2fs_get_mem(bytes, &refcount->list); |
@@ -3424,7 +3424,7 @@ static void e2fsck_pass1(e2fsck_t ctx) | |||
3424 | continue; | 3424 | continue; |
3425 | } | 3425 | } |
3426 | if ((inode->i_links_count || inode->i_blocks || | 3426 | if ((inode->i_links_count || inode->i_blocks || |
3427 | inode->i_blocks || inode->i_block[0]) && | 3427 | inode->i_block[0]) && |
3428 | fix_problem(ctx, PR_1_JOURNAL_INODE_NOT_CLEAR, | 3428 | fix_problem(ctx, PR_1_JOURNAL_INODE_NOT_CLEAR, |
3429 | &pctx)) { | 3429 | &pctx)) { |
3430 | memset(inode, 0, inode_size); | 3430 | memset(inode, 0, inode_size); |
@@ -12195,11 +12195,7 @@ static void swap_filesys(e2fsck_t ctx) | |||
12195 | void *e2fsck_allocate_memory(e2fsck_t ctx, unsigned int size, | 12195 | void *e2fsck_allocate_memory(e2fsck_t ctx, unsigned int size, |
12196 | const char *description) | 12196 | const char *description) |
12197 | { | 12197 | { |
12198 | void *ret; | 12198 | return xzalloc(size); |
12199 | char buf[256]; | ||
12200 | |||
12201 | ret = xzalloc(size); | ||
12202 | return ret; | ||
12203 | } | 12199 | } |
12204 | 12200 | ||
12205 | static char *string_copy(const char *str, int len) | 12201 | static char *string_copy(const char *str, int len) |