Many files:
e2fsck.h: If EXT2_FLAT_INCLUDES is defined, then assume all of
the ext2-specific header files are in a flat directory.
dirinfo.c, ehandler.c, pass1.c, pass1b.c, pass2.c, pass5.c,
super.c, swapfs.c, unix.c: Explicitly cast all assignments
from void * to be compatible with C++.
unix.c (sync_disk): Remove sync_disk and calls to that function,
since ext2fs_close() now takes care of this.
pass1.c, pass1b.c, pass2.c, pass3.c, swapfs, badblocks.c,
ehandler.c, unix.c: Change use of private to be priv_data, to
avoid C++ reserved name clash.
diff --git a/e2fsck/ehandler.c b/e2fsck/ehandler.c
index b370756..9f1a0bc 100644
--- a/e2fsck/ehandler.c
+++ b/e2fsck/ehandler.c
@@ -29,10 +29,10 @@
{
int i;
char *p;
- ext2_filsys fs = channel->app_data;
+ ext2_filsys fs = (ext2_filsys) channel->app_data;
e2fsck_t ctx;
- ctx = fs->private;
+ ctx = (e2fsck_t) fs->priv_data;
/*
* If more than one block was read, try reading each block
@@ -72,10 +72,10 @@
{
int i;
const char *p;
- ext2_filsys fs = channel->app_data;
+ ext2_filsys fs = (ext2_filsys) channel->app_data;
e2fsck_t ctx;
- ctx = fs->private;
+ ctx = (e2fsck_t) fs->priv_data;
/*
* If more than one block was written, try writing each block