summaryrefslogtreecommitdiff
path: root/lib/ext2fs/getsize.c
diff options
context:
space:
mode:
authorTheodore Ts'o <tytso@mit.edu>1998-01-19 14:47:53 +0000
committerTheodore Ts'o <tytso@mit.edu>1998-01-19 14:47:53 +0000
commitb5abe6fac9c9e7caf4710501d1657d30e4857ef6 (patch)
tree32edf49a6d03079dfc001e15ddc0b197777568f3 /lib/ext2fs/getsize.c
parent45d2161466e32b3e67115951ab1eb7eef25c218a (diff)
downloade2fsprogs-b5abe6fac9c9e7caf4710501d1657d30e4857ef6.tar.gz
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)
Diffstat (limited to 'lib/ext2fs/getsize.c')
-rw-r--r--lib/ext2fs/getsize.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/ext2fs/getsize.c b/lib/ext2fs/getsize.c
index a8cd59cd..296035d1 100644
--- a/lib/ext2fs/getsize.c
+++ b/lib/ext2fs/getsize.c
@@ -26,7 +26,12 @@
#include <sys/disklabel.h>
#endif /* HAVE_SYS_DISKLABEL_H */
+#if EXT2_FLAT_INCLUDES
+#include "ext2_fs.h"
+#else
#include <linux/ext2_fs.h>
+#endif
+
#include "ext2fs.h"
static int valid_offset (int fd, ext2_loff_t offset)