diff options
| author | Theodore Ts'o <tytso@mit.edu> | 1998-04-30 17:35:59 +0000 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 1998-04-30 17:35:59 +0000 |
| commit | 4c77fe50d97a773e32a4756c79dade3adbb6a601 (patch) | |
| tree | e0fe519a5930401ed0ed674c351c9b21fcf9c1af /resize | |
| parent | 76f875daa1c9c2cdc72f0c6f0f7be4bbc7f0fc07 (diff) | |
| download | e2fsprogs-4c77fe50d97a773e32a4756c79dade3adbb6a601.tar.gz | |
ChangeLog, e2fsck.h, pass1.c, super.c:
pass1.c (process_inode_cmp): Use EXT2_QSORT_TYPE to define the
appropriate return type for comparison functions for qsort.
e2fsck.h: Add #ifdef protection for unistd.h
super.c: Remove header files already included by e2fsck.h
ChangeLog, dblist.c, ext2fs.h:
ext2fs.h: Define EXT2_QSORT_TYPE appropriately for the return type for
comparison functions for qsort.
dblist.c (dir_block_cmp): Use EXT2_QSORT_TYPE in function declaration.
ChangeLog, extent.c:
extent.c (ext2fs_create_extent_table): Use ext2fs_free_mem instead of
free().
(extent_cmp): Use EXT2_QSORT_TYPE to define the appropriate return
type for comparison functions for qsort.
Diffstat (limited to 'resize')
| -rw-r--r-- | resize/ChangeLog | 7 | ||||
| -rw-r--r-- | resize/extent.c | 4 |
2 files changed, 9 insertions, 2 deletions
diff --git a/resize/ChangeLog b/resize/ChangeLog index 4b852024..1a632fbe 100644 --- a/resize/ChangeLog +++ b/resize/ChangeLog @@ -1,3 +1,10 @@ +1998-04-28 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * extent.c (ext2fs_create_extent_table): Use ext2fs_free_mem + instead of free(). + (extent_cmp): Use EXT2_QSORT_TYPE to define the appropriate + return type for comparison functions for qsort. + 1998-04-26 Theodore Ts'o <tytso@rsts-11.mit.edu> * resize2fs.c (adjust_superblock): diff --git a/resize/extent.c b/resize/extent.c index b583baa7..dbd60220 100644 --- a/resize/extent.c +++ b/resize/extent.c @@ -49,7 +49,7 @@ errcode_t ext2fs_create_extent_table(ext2_extent *ret_extent, int size) retval = ext2fs_get_mem(sizeof(struct ext2_extent_entry) * extent->size, (void **) &extent->list); if (retval) { - free(extent); + ext2fs_free_mem((void **) &extent); return retval; } memset(extent->list, 0, @@ -121,7 +121,7 @@ errcode_t ext2fs_add_extent_entry(ext2_extent extent, __u32 old_loc, __u32 new_l /* * Helper function for qsort */ -static int extent_cmp(const void *a, const void *b) +static EXT2_QSORT_TYPE extent_cmp(const void *a, const void *b) { const struct ext2_extent_entry *db_a; const struct ext2_extent_entry *db_b; |