Merge branch 'maint' into next

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

diff --git a/resize/extent.c b/resize/extent.c
index b583baa..ca2c68c 100644 (file)
--- a/resize/extent.c
+++ b/resize/extent.c
@@ -5,10 +5,14 @@
  * translation table, for moving multiple contiguous ranges (extents)
  * of blocks or inodes.
  *
- * Copyright (C) 1997 Theodore Ts'o
+ * Copyright (C) 1997, 1998 by Theodore Ts'o and
+ *     PowerQuest, Inc.
+ *
+ * Copyright (C) 1999, 2000 by Theosore Ts'o
  * 
  * %Begin-Header%
- * All rights reserved.
+ * This file may be redistributed under the terms of the GNU Public
+ * License.
  * %End-Header%
  */
 
@@ -35,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));
@@ -46,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) {
-               free(extent);
+               ext2fs_free_mem(&extent);
                return retval;
        }
        memset(extent->list, 0,
@@ -64,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);
 }
 
 /*
@@ -86,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;
@@ -121,7 +124,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;
@@ -139,7 +142,7 @@ static int 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) {
@@ -190,11 +193,11 @@ void ext2fs_extent_dump(ext2_extent extent, FILE *out)
        int     i;
        struct ext2_extent_entry *ent;
        
-       fputs("# Extent dump:\n", out);
-       fprintf(out, "#\tNum=%d, Size=%d, Cursor=%d, Sorted=%d\n",
+       fputs(_("# Extent dump:\n"), out);
+       fprintf(out, _("#\tNum=%d, Size=%d, Cursor=%d, Sorted=%d\n"),
               extent->num, extent->size, extent->cursor, extent->sorted);
        for (i=0, ent=extent->list; i < extent->num; i++, ent++) {
-               fprintf(out, "#\t\t %u -> %u (%d)\n", ent->old_loc,
+               fprintf(out, _("#\t\t %u -> %u (%d)\n"), ent->old_loc,
                        ent->new_loc, ent->size);
        }
 }