Many files:
resize2fs.h: If EXT2_FLAT_INCLUDES is defined, then assume all
of the ext2-specific header files are in a flat directory.
ext2_block_move.c, ext2_inode_move.c, extent.c, resize2fs.c,
resize2fs.h: Rename variables named "new" to "new_block",
"new_inode", or "new_loc" to avoid C++ reserved word
clash.
ext2_block_move.c, ext2_inode_move.c, extent.c, resize2fs.c,
sim_progress.c: Use ext2fs_get_memory(),
ext2fs_free_memory(), et. al., instead of malloc() and
free().
ext2_block_move.c, ext2_inode_move.c, extent.c: Explicitly cast
all assignments from void * to be compatible with C++.
banalysis.c, banalysis.h, ext2_inode_move.c, ext2_block_move.c:
Change private to priv_data to avoid C++ namespace clash.
ChangeLog, badblocks.8.in:
badblocks.8.in: Add documentation for the -s option.
diff --git a/resize/extent.c b/resize/extent.c
index 0f0ef4c..b51e653 100644
--- a/resize/extent.c
+++ b/resize/extent.c
@@ -15,7 +15,7 @@
#include "resize2fs.h"
struct ext2_extent_entry {
- __u32 old, new;
+ __u32 old_loc, new_loc;
int size;
};
@@ -32,25 +32,29 @@
*/
errcode_t ext2fs_create_extent_table(ext2_extent *ret_extent, int size)
{
- ext2_extent new;
+ ext2_extent extent;
+ errcode_t retval;
+
+ retval = ext2fs_get_mem(sizeof(struct _ext2_extent),
+ (void **) &extent);
+ if (retval)
+ return retval;
+ memset(extent, 0, sizeof(struct _ext2_extent));
- new = malloc(sizeof(struct _ext2_extent));
- if (!new)
- return ENOMEM;
- memset(new, 0, sizeof(struct _ext2_extent));
+ extent->size = size ? size : 50;
+ extent->cursor = 0;
+ extent->num = 0;
+ extent->sorted = 1;
- new->size = size ? size : 50;
- new->cursor = 0;
- new->num = 0;
- new->sorted = 1;
-
- new->list = malloc(sizeof(struct ext2_extent_entry) * new->size);
- if (!new->list) {
- free(new);
- return ENOMEM;
+ retval = ext2fs_get_mem(sizeof(struct ext2_extent_entry) *
+ extent->size, (void **) &extent->list);
+ if (retval) {
+ free(extent);
+ return retval;
}
- memset(new->list, 0, sizeof(struct ext2_extent_entry) * new->size);
- *ret_extent = new;
+ memset(extent->list, 0,
+ sizeof(struct ext2_extent_entry) * extent->size);
+ *ret_extent = extent;
return 0;
}
@@ -60,30 +64,29 @@
void ext2fs_free_extent_table(ext2_extent extent)
{
if (extent->list)
- free(extent->list);
+ ext2fs_free_mem((void **) &extent->list);
extent->list = 0;
extent->size = 0;
extent->num = 0;
- free(extent);
+ ext2fs_free_mem((void **) &extent);
}
/*
* Add an entry to the extent table
*/
-errcode_t ext2fs_add_extent_entry(ext2_extent extent, __u32 old, __u32 new)
+errcode_t ext2fs_add_extent_entry(ext2_extent extent, __u32 old_loc, __u32 new_loc)
{
- struct ext2_extent_entry *p;
- int newsize;
- int curr;
- struct ext2_extent_entry *ent;
+ struct ext2_extent_entry *ent;
+ errcode_t retval;
+ int newsize;
+ int curr;
if (extent->num >= extent->size) {
newsize = extent->size + 100;
- p = realloc(extent->list,
- sizeof(struct ext2_extent_entry) * newsize);
- if (!p)
- return ENOMEM;
- extent->list = p;
+ retval = ext2fs_resize_mem(sizeof(struct ext2_extent_entry) *
+ newsize, (void **) &extent->list);
+ if (retval)
+ return retval;
extent->size = newsize;
}
curr = extent->num;
@@ -94,20 +97,20 @@
* extent
*/
ent--;
- if ((ent->old + ent->size == old) &&
- (ent->new + ent->size == new)) {
+ if ((ent->old_loc + ent->size == old_loc) &&
+ (ent->new_loc + ent->size == new_loc)) {
ent->size++;
return 0;
}
/*
* Now see if we're going to ruin the sorting
*/
- if (ent->old + ent->size > old)
+ if (ent->old_loc + ent->size > old_loc)
extent->sorted = 0;
ent++;
}
- ent->old = old;
- ent->new = new;
+ ent->old_loc = old_loc;
+ ent->new_loc = new_loc;
ent->size = 1;
extent->num++;
return 0;
@@ -118,17 +121,20 @@
*/
static int extent_cmp(const void *a, const void *b)
{
- const struct ext2_extent_entry *db_a = a;
- const struct ext2_extent_entry *db_b = b;
+ const struct ext2_extent_entry *db_a;
+ const struct ext2_extent_entry *db_b;
- return (db_a->old - db_b->old);
+ db_a = (struct ext2_extent_entry *) a;
+ db_b = (struct ext2_extent_entry *) b;
+
+ return (db_a->old_loc - db_b->old_loc);
}
/*
* Given an inode map and inode number, look up the old inode number
- * and return the new inode number
+ * and return the new inode number.
*/
-__u32 ext2fs_extent_translate(ext2_extent extent, __u32 old)
+__u32 ext2fs_extent_translate(ext2_extent extent, __u32 old_loc)
{
int low, high, mid;
ino_t lowval, highval;
@@ -149,24 +155,24 @@
mid = low;
else {
/* Interpolate for efficiency */
- lowval = extent->list[low].old;
- highval = extent->list[high].old;
+ lowval = extent->list[low].old_loc;
+ highval = extent->list[high].old_loc;
- if (old < lowval)
+ if (old_loc < lowval)
range = 0;
- else if (old > highval)
+ else if (old_loc > highval)
range = 1;
else
- range = ((float) (old - lowval)) /
+ range = ((float) (old_loc - lowval)) /
(highval - lowval);
mid = low + ((int) (range * (high-low)));
}
#endif
- if ((old >= extent->list[mid].old) &&
- (old < extent->list[mid].old + extent->list[mid].size))
- return (extent->list[mid].new +
- (old - extent->list[mid].old));
- if (old < extent->list[mid].old)
+ if ((old_loc >= extent->list[mid].old_loc) &&
+ (old_loc < extent->list[mid].old_loc + extent->list[mid].size))
+ return (extent->list[mid].new_loc +
+ (old_loc - extent->list[mid].old_loc));
+ if (old_loc < extent->list[mid].old_loc)
high = mid-1;
else
low = mid+1;
@@ -186,35 +192,35 @@
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,
- ent->new, ent->size);
+ fprintf(out, "#\t\t %u -> %u (%d)\n", ent->old_loc,
+ ent->new_loc, ent->size);
}
}
/*
* Iterate over the contents of the extent table
*/
-errcode_t ext2fs_iterate_extent(ext2_extent extent, __u32 *old,
- __u32 *new, int *size)
+errcode_t ext2fs_iterate_extent(ext2_extent extent, __u32 *old_loc,
+ __u32 *new_loc, int *size)
{
struct ext2_extent_entry *ent;
- if (!old) {
+ if (!old_loc) {
extent->cursor = 0;
return 0;
}
if (extent->cursor >= extent->num) {
- *old = 0;
- *new = 0;
+ *old_loc = 0;
+ *new_loc = 0;
*size = 0;
return 0;
}
ent = extent->list + extent->cursor++;
- *old = ent->old;
- *new = ent->new;
+ *old_loc = ent->old_loc;
+ *new_loc = ent->new_loc;
*size = ent->size;
return 0;
}