Many files:
inode.c (ext2fs_open_inode_scan): Initialize the group variables
so that we don't need to call get_next_blockgroup() the first
time around. Saves a bit of time, and prevents us from
needing to assign -1 to current_group (which is an unsigned
value).
icount.c (insert_icount_el): Cast the estimated number of inodes
from a float to an ino_t.
alloc.c, alloc_tables.c, badlbocks.c, bb_compat.c, bb_inode.c,
bitmaps.c, bitops.c, block.c, bmap.c, bmove.c, brel_ma.c,
check_desc.c, closefs.c, cmp_bitmaps.c, dblist.c,
dblist_dir.c, dir_iterate.c, dirblock.c, dupfs.c, expanddir.c,
ext2fs.h, fileio.c, freefs.c, get_pathname.c, getsize.c,
icount.c, initialize.c, inline.c, inode.c, irel_ma.c,
ismounted.c, link.c, lookup.c, mkdir.c, namei.c, native.c,
newdir.c, openfs.c, read_bb.c, read_bb_file.c, rs_bitmap.c,
rw_bitmaps.c, swapfs.c, test_io.c, tst_badblocks.c,
tst_getsize.c, tst_iscan.c, unix_io.c, unlink.c, valid_blk.c,
version.c: If EXT2_FLAT_INCLUDES is defined, then assume all
of the ext2-specific header files are in a flat directory.
block.c, bmove.c, dirblock.c, fileio.c: Explicitly cast
all assignments from void * to be compatible with C++.
closefs.c (ext2fs_flush): Add a call to io_channel_flush() to
make sure the contents of the disk are flushed to disk.
dblist.c (ext2fs_add_dir_block): Change new to be new_entry to
avoid C++ namespace clash.
bitmaps.c (ext2fs_copy_bitmap): Change new to be new_map to
avoid C++ namespace clash.
ext2fs.h, bb_inode.c, block.c, bmove.c, brel.h, brel_ma.c,
irel.h, irel_ma.c, dblist.c, dblist_dir.c, dir_iterate.c,
ext2fsP.h, expanddir.c, get_pathname.c, inode.c, link.c,
unlink.c: Change private to be priv_data (to avoid C++
namespace clash)
diff --git a/lib/ext2fs/block.c b/lib/ext2fs/block.c
index c594d8d..1293403 100644
--- a/lib/ext2fs/block.c
+++ b/lib/ext2fs/block.c
@@ -15,7 +15,11 @@
#include <unistd.h>
#endif
+#if EXT2_FLAT_INCLUDES
+#include "ext2_fs.h"
+#else
#include <linux/ext2_fs.h>
+#endif
#include "ext2fs.h"
@@ -26,7 +30,7 @@
int bcount,
blk_t ref_blk,
int ref_offset,
- void *private);
+ void *priv_data);
int bcount;
int bsize;
int flags;
@@ -34,7 +38,7 @@
char *ind_buf;
char *dind_buf;
char *tind_buf;
- void *private;
+ void *priv_data;
};
static int block_iterate_ind(blk_t *ind_block, blk_t ref_block,
@@ -49,7 +53,7 @@
!(ctx->flags & BLOCK_FLAG_DATA_ONLY))
ret = (*ctx->func)(ctx->fs, ind_block,
BLOCK_COUNT_IND, ref_block,
- ref_offset, ctx->private);
+ ref_offset, ctx->priv_data);
if (!*ind_block || (ret & BLOCK_ABORT)) {
ctx->bcount += limit;
return ret;
@@ -78,7 +82,7 @@
for (i = 0; i < limit; i++, ctx->bcount++, block_nr++) {
flags = (*ctx->func)(ctx->fs, block_nr, ctx->bcount,
*ind_block, offset,
- ctx->private);
+ ctx->priv_data);
changed |= flags;
if (flags & BLOCK_ABORT) {
ret |= BLOCK_ABORT;
@@ -92,7 +96,7 @@
continue;
flags = (*ctx->func)(ctx->fs, block_nr, ctx->bcount,
*ind_block, offset,
- ctx->private);
+ ctx->priv_data);
changed |= flags;
if (flags & BLOCK_ABORT) {
ret |= BLOCK_ABORT;
@@ -118,7 +122,7 @@
!(ret & BLOCK_ABORT))
ret |= (*ctx->func)(ctx->fs, ind_block,
BLOCK_COUNT_IND, ref_block,
- ref_offset, ctx->private);
+ ref_offset, ctx->priv_data);
return ret;
}
@@ -134,7 +138,7 @@
!(ctx->flags & BLOCK_FLAG_DATA_ONLY))
ret = (*ctx->func)(ctx->fs, dind_block,
BLOCK_COUNT_DIND, ref_block,
- ref_offset, ctx->private);
+ ref_offset, ctx->priv_data);
if (!*dind_block || (ret & BLOCK_ABORT)) {
ctx->bcount += limit*limit;
return ret;
@@ -205,7 +209,7 @@
!(ret & BLOCK_ABORT))
ret |= (*ctx->func)(ctx->fs, dind_block,
BLOCK_COUNT_DIND, ref_block,
- ref_offset, ctx->private);
+ ref_offset, ctx->priv_data);
return ret;
}
@@ -221,7 +225,7 @@
!(ctx->flags & BLOCK_FLAG_DATA_ONLY))
ret = (*ctx->func)(ctx->fs, tind_block,
BLOCK_COUNT_TIND, ref_block,
- ref_offset, ctx->private);
+ ref_offset, ctx->priv_data);
if (!*tind_block || (ret & BLOCK_ABORT)) {
ctx->bcount += limit*limit*limit;
return ret;
@@ -292,7 +296,7 @@
!(ret & BLOCK_ABORT))
ret |= (*ctx->func)(ctx->fs, tind_block,
BLOCK_COUNT_TIND, ref_block,
- ref_offset, ctx->private);
+ ref_offset, ctx->priv_data);
return ret;
}
@@ -306,8 +310,8 @@
int blockcnt,
blk_t ref_blk,
int ref_offset,
- void *private),
- void *private)
+ void *priv_data),
+ void *priv_data)
{
int i;
int got_inode = 0;
@@ -325,7 +329,7 @@
ctx.fs = fs;
ctx.func = func;
- ctx.private = private;
+ ctx.priv_data = priv_data;
ctx.flags = flags;
ctx.bcount = 0;
if (block_buf) {
@@ -352,7 +356,7 @@
ret |= (*ctx.func)(fs,
&inode.osd1.hurd1.h_i_translator,
BLOCK_COUNT_TRANSLATOR,
- 0, 0, private);
+ 0, 0, priv_data);
if (ret & BLOCK_ABORT)
goto abort;
}
@@ -364,7 +368,7 @@
for (i = 0; i < EXT2_NDIR_BLOCKS ; i++, ctx.bcount++) {
if (blocks[i] || (flags & BLOCK_FLAG_APPEND)) {
ret |= (*ctx.func)(fs, &blocks[i],
- ctx.bcount, 0, 0, private);
+ ctx.bcount, 0, 0, priv_data);
if (ret & BLOCK_ABORT)
goto abort;
}
@@ -412,7 +416,7 @@
int (*func)(ext2_filsys fs,
blk_t *blocknr,
int bcount,
- void *private);
+ void *priv_data);
void *real_private;
};
@@ -420,9 +424,9 @@
#pragma argsused
#endif
static int xlate_func(ext2_filsys fs, blk_t *blocknr, int blockcnt,
- blk_t ref_block, int ref_offset, void *private)
+ blk_t ref_block, int ref_offset, void *priv_data)
{
- struct xlate *xl = private;
+ struct xlate *xl = (struct xlate *) priv_data;
return (*xl->func)(fs, blocknr, blockcnt, xl->real_private);
}
@@ -434,12 +438,12 @@
int (*func)(ext2_filsys fs,
blk_t *blocknr,
int blockcnt,
- void *private),
- void *private)
+ void *priv_data),
+ void *priv_data)
{
struct xlate xl;
- xl.real_private = private;
+ xl.real_private = priv_data;
xl.func = func;
return ext2fs_block_iterate2(fs, ino, flags, block_buf,