diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2003-08-01 09:41:07 -0400 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2003-08-01 09:41:07 -0400 |
| commit | c4e3d3f374b409500e3dd05c0b0eca6ac98a6b4e (patch) | |
| tree | 2d1db6d042abcaf015834480ea1ca8c26c456f5d /lib/ext2fs/rw_bitmaps.c | |
| parent | 0ec1b153ba6291aac5faa00c197a71d1cb0165f5 (diff) | |
| download | e2fsprogs-c4e3d3f374b409500e3dd05c0b0eca6ac98a6b4e.tar.gz | |
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.
Diffstat (limited to 'lib/ext2fs/rw_bitmaps.c')
| -rw-r--r-- | lib/ext2fs/rw_bitmaps.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/lib/ext2fs/rw_bitmaps.c b/lib/ext2fs/rw_bitmaps.c index 4d47da41..2c5f3976 100644 --- a/lib/ext2fs/rw_bitmaps.c +++ b/lib/ext2fs/rw_bitmaps.c @@ -68,7 +68,7 @@ errcode_t ext2fs_write_inode_bitmap(ext2_filsys fs) return 0; nbytes = (size_t) ((EXT2_INODES_PER_GROUP(fs->super)+7) / 8); - retval = ext2fs_get_mem(fs->blocksize, (void **) &bitmap_block); + retval = ext2fs_get_mem(fs->blocksize, &bitmap_block); if (retval) return retval; memset(bitmap_block, 0xff, fs->blocksize); @@ -89,7 +89,7 @@ errcode_t ext2fs_write_inode_bitmap(ext2_filsys fs) inode_bitmap += nbytes; } fs->flags &= ~EXT2_FLAG_IB_DIRTY; - ext2fs_free_mem((void **) &bitmap_block); + ext2fs_free_mem(&bitmap_block); return 0; } @@ -111,7 +111,7 @@ errcode_t ext2fs_write_block_bitmap (ext2_filsys fs) if (!block_bitmap) return 0; nbytes = EXT2_BLOCKS_PER_GROUP(fs->super) / 8; - retval = ext2fs_get_mem(fs->blocksize, (void **) &bitmap_block); + retval = ext2fs_get_mem(fs->blocksize, &bitmap_block); if (retval) return retval; memset(bitmap_block, 0xff, fs->blocksize); @@ -141,7 +141,7 @@ errcode_t ext2fs_write_block_bitmap (ext2_filsys fs) block_bitmap += nbytes; } fs->flags &= ~EXT2_FLAG_BB_DIRTY; - ext2fs_free_mem((void **) &bitmap_block); + ext2fs_free_mem(&bitmap_block); return 0; } @@ -159,7 +159,7 @@ static errcode_t read_bitmaps(ext2_filsys fs, int do_inode, int do_block) fs->write_bitmaps = ext2fs_write_bitmaps; - retval = ext2fs_get_mem(strlen(fs->device_name) + 80, (void **) &buf); + retval = ext2fs_get_mem(strlen(fs->device_name) + 80, &buf); if (retval) return retval; if (do_block) { @@ -180,7 +180,7 @@ static errcode_t read_bitmaps(ext2_filsys fs, int do_inode, int do_block) goto cleanup; inode_bitmap = fs->inode_map->bitmap; } - ext2fs_free_mem((void **) &buf); + ext2fs_free_mem(&buf); if (fs->flags & EXT2_FLAG_IMAGE_FILE) { if (inode_bitmap) { @@ -246,15 +246,15 @@ static errcode_t read_bitmaps(ext2_filsys fs, int do_inode, int do_block) cleanup: if (do_block) { - ext2fs_free_mem((void **) &fs->block_map); + ext2fs_free_mem(&fs->block_map); fs->block_map = 0; } if (do_inode) { - ext2fs_free_mem((void **) &fs->inode_map); + ext2fs_free_mem(&fs->inode_map); fs->inode_map = 0; } if (buf) - ext2fs_free_mem((void **) &buf); + ext2fs_free_mem(&buf); return retval; } |