Fix up debian copyright files to avoid Lintian errors

[tools/e2fsprogs.git] / resize / extent.c

diff --git a/resize/extent.c b/resize/extent.c
index 5f5d614..ca2c68c 100644 (file)
--- a/resize/extent.c
+++ b/resize/extent.c
@@ -39,8 +39,7 @@ errcode_t ext2fs_create_extent_table(ext2_extent *ret_extent, int size)
        ext2_extent     extent;
        errcode_t       retval;
        
-       retval = ext2fs_get_mem(sizeof(struct _ext2_extent),
-                               (void **) &extent);
+       retval = ext2fs_get_mem(sizeof(struct _ext2_extent), &extent);
        if (retval)
                return retval;
        memset(extent, 0, sizeof(struct _ext2_extent));
@@ -50,10 +49,10 @@ errcode_t ext2fs_create_extent_table(ext2_extent *ret_extent, int size)
        extent->num = 0;
        extent->sorted = 1;
 
-       retval = ext2fs_get_mem(sizeof(struct ext2_extent_entry) *
-                               extent->size, (void **) &extent->list);
+       retval = ext2fs_get_array(sizeof(struct ext2_extent_entry),
+                               extent->size, &extent->list);
        if (retval) {
-               ext2fs_free_mem((void **) &extent);
+               ext2fs_free_mem(&extent);
                return retval;
        }
        memset(extent->list, 0,
@@ -68,11 +67,11 @@ errcode_t ext2fs_create_extent_table(ext2_extent *ret_extent, int size)
 void ext2fs_free_extent_table(ext2_extent extent)
 {
        if (extent->list)
-               ext2fs_free_mem((void **) &extent->list);
+               ext2fs_free_mem(&extent->list);
        extent->list = 0;
        extent->size = 0;
        extent->num = 0;
-       ext2fs_free_mem((void **) &extent);
+       ext2fs_free_mem(&extent);
 }
 
 /*
@@ -90,7 +89,7 @@ errcode_t ext2fs_add_extent_entry(ext2_extent extent, __u32 old_loc, __u32 new_l
                retval = ext2fs_resize_mem(sizeof(struct ext2_extent_entry) * 
                                           extent->size, 
                                           sizeof(struct ext2_extent_entry) * 
-                                          newsize, (void **) &extent->list);
+                                          newsize, &extent->list);
                if (retval)
                        return retval;
                extent->size = newsize;
@@ -143,7 +142,7 @@ static EXT2_QSORT_TYPE extent_cmp(const void *a, const void *b)
 __u32 ext2fs_extent_translate(ext2_extent extent, __u32 old_loc)
 {
        int     low, high, mid;
-       ino_t   lowval, highval;
+       __u32   lowval, highval;
        float   range;
 
        if (!extent->sorted) {