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.
diff --git a/resize/extent.c b/resize/extent.c
index b583baa..dbd6022 100644
--- a/resize/extent.c
+++ b/resize/extent.c
@@ -49,7 +49,7 @@
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 @@
/*
* 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;