ext2fs_getmem(), ext2fs_free_mem(), and ext2fs_resize_mem()
all now take a 'void *' instead of a 'void **' in order to
avoid pointer aliasing problems with GCC 3.x.
diff --git a/lib/ext2fs/openfs.c b/lib/ext2fs/openfs.c
index eb5a7dc..7dd5737 100644
--- a/lib/ext2fs/openfs.c
+++ b/lib/ext2fs/openfs.c
@@ -82,8 +82,7 @@
EXT2_CHECK_MAGIC(manager, EXT2_ET_MAGIC_IO_MANAGER);
- retval = ext2fs_get_mem(sizeof(struct struct_ext2_filsys),
- (void **) &fs);
+ retval = ext2fs_get_mem(sizeof(struct struct_ext2_filsys), &fs);
if (retval)
return retval;
@@ -96,16 +95,16 @@
if (retval)
goto cleanup;
fs->io->app_data = fs;
- retval = ext2fs_get_mem(strlen(name)+1, (void **) &fs->device_name);
+ retval = ext2fs_get_mem(strlen(name)+1, &fs->device_name);
if (retval)
goto cleanup;
strcpy(fs->device_name, name);
- retval = ext2fs_get_mem(SUPERBLOCK_SIZE, (void **) &fs->super);
+ retval = ext2fs_get_mem(SUPERBLOCK_SIZE, &fs->super);
if (retval)
goto cleanup;
if (flags & EXT2_FLAG_IMAGE_FILE) {
retval = ext2fs_get_mem(sizeof(struct ext2_image_hdr),
- (void **) &fs->image_header);
+ &fs->image_header);
if (retval)
goto cleanup;
retval = io_channel_read_blk(fs->io, 0,
@@ -140,8 +139,7 @@
io_channel_set_blksize(fs->io, SUPERBLOCK_OFFSET);
superblock = 1;
group_block = 0;
- retval = ext2fs_get_mem(SUPERBLOCK_SIZE,
- (void **) &fs->orig_super);
+ retval = ext2fs_get_mem(SUPERBLOCK_SIZE, &fs->orig_super);
if (retval)
goto cleanup;
}
@@ -242,7 +240,7 @@
EXT2_DESC_PER_BLOCK(fs->super) - 1)
/ EXT2_DESC_PER_BLOCK(fs->super);
retval = ext2fs_get_mem(fs->desc_blocks * fs->blocksize,
- (void **) &fs->group_desc);
+ &fs->group_desc);
if (retval)
goto cleanup;
if (!group_block)