summaryrefslogtreecommitdiff
path: root/e2fsck/dirinfo.c
diff options
context:
space:
mode:
authorTheodore Ts'o <tytso@mit.edu>1998-01-19 14:50:49 +0000
committerTheodore Ts'o <tytso@mit.edu>1998-01-19 14:50:49 +0000
commit54dc7ca2869897ae8cb81a9ab9880ebff11680bc (patch)
tree10282bd1896ece0d7b57192c1a4468e2eae9b5ac /e2fsck/dirinfo.c
parentb5abe6fac9c9e7caf4710501d1657d30e4857ef6 (diff)
downloade2fsprogs-54dc7ca2869897ae8cb81a9ab9880ebff11680bc.tar.gz
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.
Diffstat (limited to 'e2fsck/dirinfo.c')
-rw-r--r--e2fsck/dirinfo.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/e2fsck/dirinfo.c b/e2fsck/dirinfo.c
index 2ab4a94e..d2dca595 100644
--- a/e2fsck/dirinfo.c
+++ b/e2fsck/dirinfo.c
@@ -29,9 +29,10 @@ void e2fsck_add_dir_info(e2fsck_t ctx, ino_t ino, ino_t parent)
if (retval)
num_dirs = 1024; /* Guess */
ctx->dir_info_size = num_dirs + 10;
- ctx->dir_info = e2fsck_allocate_memory(ctx,
- ctx->dir_info_size * sizeof (struct dir_info),
- "directory map");
+ ctx->dir_info = (struct dir_info *)
+ e2fsck_allocate_memory(ctx, ctx->dir_info_size
+ * sizeof (struct dir_info),
+ "directory map");
}
if (ctx->dir_info_count >= ctx->dir_info_size) {