[Patch 2/13] Miscellaneous Cleanups

[Patch 2/13] Miscellaneous Cleanups

[Girish Shilamkar]

Miscellaneous cleanups.

Signed-off-by: Andreas Dilger <adilger@clusterfs.com>
Signed-off-by: Girish Shilamkar <girish@clusterfs.com>

Index: e2fsprogs-1.40.1/Makefile.in
===================================================================
--- e2fsprogs-1.40.1.orig/Makefile.in
+++ e2fsprogs-1.40.1/Makefile.in
@@ -10,7 +10,7 @@ INSTALL = @INSTALL@
 @RESIZER_CMT@RESIZE_DIR= resize
 @DEBUGFS_CMT@DEBUGFS_DIR= debugfs
 
-LIB_SUBDIRS=lib/et lib/ss lib/e2p lib/ext2fs lib/uuid lib/blkid intl
+LIB_SUBDIRS=lib/et lib/ss lib/e2p lib/uuid lib/ext2fs lib/blkid intl
 PROG_SUBDIRS=e2fsck $(DEBUGFS_DIR) misc $(RESIZE_DIR) tests/progs po
 SUBDIRS=util $(LIB_SUBDIRS) $(PROG_SUBDIRS) tests
 
Index: e2fsprogs-1.40.1/debugfs/set_fields.c
===================================================================
--- e2fsprogs-1.40.1.orig/debugfs/set_fields.c
+++ e2fsprogs-1.40.1/debugfs/set_fields.c
@@ -22,6 +22,9 @@
 #ifdef HAVE_ERRNO_H
 #include <errno.h>
 #endif
+#if HAVE_STRINGS_H
+# include <strings.h>
+#endif
 #include <fcntl.h>
 #include <utime.h>
 
Index: e2fsprogs-1.40.1/lib/blkid/getsize.c
===================================================================
--- e2fsprogs-1.40.1.orig/lib/blkid/getsize.c
+++ e2fsprogs-1.40.1/lib/blkid/getsize.c
@@ -186,7 +186,7 @@ blkid_loff_t blkid_get_dev_size(int fd)
 #ifdef TEST_PROGRAM
 int main(int argc, char **argv)
 {
-	blkid_loff_t bytes;
+	long long bytes;
 	int	fd;
 
 	if (argc < 2) {

Re: [Patch 2/13] Miscellaneous Cleanups

[Theodore Tso]

On Tue, Jul 24, 2007 at 04:34:41PM +0530, Girish Shilamkar wrote:
> Miscellaneous cleanups.

Thanks, applied.

						- Ted