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)

1 files changed, 11 insertions, 7 deletions

diff --git a/lib/ext2fs/dir_iterate.c b/lib/ext2fs/dir_iterate.c
index 725cd473..9d185701 100644
--- a/lib/ext2fs/dir_iterate.c
+++ b/lib/ext2fs/dir_iterate.c
@@ -18,7 +18,11 @@
 #include <errno.h>
 #endif
 
+#if EXT2_FLAT_INCLUDES
+#include "ext2_fs.h"
+#else
 #include <linux/ext2_fs.h>
+#endif
 
 #include "ext2fsP.h"
 
@@ -30,8 +34,8 @@ errcode_t ext2fs_dir_iterate(ext2_filsys fs,
 					 int	offset,
 					 int	blocksize,
 					 char	*buf,
-					 void	*private),
-			     void *private)
+					 void	*priv_data),
+			     void *priv_data)
 {
 	struct		dir_context	ctx;
 	errcode_t	retval;
@@ -53,7 +57,7 @@ errcode_t ext2fs_dir_iterate(ext2_filsys fs,
 	}
 	ctx.func = func;
 	ctx.func2 = 0;
-	ctx.private = private;
+	ctx.priv_data = priv_data;
 	ctx.errcode = 0;
 	retval = ext2fs_block_iterate(fs, dir, 0, 0,
 				      ext2fs_process_dir_block, &ctx);
@@ -71,9 +75,9 @@ errcode_t ext2fs_dir_iterate(ext2_filsys fs,
 extern int ext2fs_process_dir_block(ext2_filsys  	fs,
 				    blk_t		*blocknr,
 				    int		blockcnt,
-				    void		*private)
+				    void		*priv_data)
 {
-	struct dir_context *ctx = (struct dir_context *) private;
+	struct dir_context *ctx = (struct dir_context *) priv_data;
 	int		offset = 0;
 	int		ret = 0;
 	int		changed = 0;
@@ -98,11 +102,11 @@ extern int ext2fs_process_dir_block(ext2_filsys  	fs,
 
 		if (ctx->func)
 			ret = (ctx->func)(dirent, offset, fs->blocksize,
-					  ctx->buf, ctx->private);
+					  ctx->buf, ctx->priv_data);
 		else if (ctx->func2) {
 			ret = (ctx->func2)(ctx->dir, entry, dirent, offset,
 					   fs->blocksize, ctx->buf,
-					   ctx->private);
+					   ctx->priv_data);
 			if (entry < DIRENT_OTHER_FILE)
 				entry++;
 		}