From 3120a50e1a35731cd8b56193a23a1991c1af4b20 Mon Sep 17 00:00:00 2001
From: Andreas Dilger <adilger@dilger.ca>
Date: Mon, 9 Jun 2014 09:53:40 -0400
Subject: [PATCH] misc: quiet minor build warnings, ignore generated files

Quiet a couple of build warnings in tst_libext2fs.c
Add missing unistd.h header for misc/util.c.

Ignore generated files for lib/ext2fs/tst_libext2fs and intl/ files.

Signed-off-by: Andreas Dilger <adilger@dilger.ca>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
---
 .gitignore                 | 10 ++++++++++
 lib/ext2fs/tst_libext2fs.c |  4 ++--
 misc/util.c                |  5 ++++-
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1024cc3..7262ac4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -51,6 +51,12 @@ e2fsck/tst_problem
 e2fsck/tst_refcount
 e2fsck/tst_region
 e2fsprogs.spec
+intl/charset.alias
+intl/libgnuintl.h
+intl/libintl.a
+intl/libintl.h
+intl/ref-add.sed
+intl/ref-del.sed
 lib/blkid/blkid.h
 lib/blkid/blkid.pc
 lib/blkid/blkid_types.h
@@ -84,11 +90,13 @@ lib/et/compile_et
 lib/et/libcom_err.a
 lib/et/subdirs
 lib/ext2fs/crc32c_table.h
+lib/ext2fs/debug_cmds.c
 lib/ext2fs/ext2_err.c
 lib/ext2fs/ext2_err.et
 lib/ext2fs/ext2_err.h
 lib/ext2fs/ext2_types.h
 lib/ext2fs/ext2fs.pc
+lib/ext2fs/extent_cmds.c
 lib/ext2fs/gen_crc32ctable
 lib/ext2fs/libext2fs.a
 lib/ext2fs/subdirs
@@ -97,12 +105,14 @@ lib/ext2fs/tst_bitmaps
 lib/ext2fs/tst_bitmaps_cmd.c
 lib/ext2fs/tst_bitmaps_out
 lib/ext2fs/tst_bitops
+lib/ext2fs/tst_cmds.c
 lib/ext2fs/tst_csum
 lib/ext2fs/tst_crc32c
 lib/ext2fs/tst_icount
 lib/ext2fs/tst_inline
 lib/ext2fs/tst_inode_size
 lib/ext2fs/tst_iscan
+lib/ext2fs/tst_libext2fs
 lib/ext2fs/tst_super_size
 lib/ext2fs/tst_types
 lib/libblkid.a
diff --git a/lib/ext2fs/tst_libext2fs.c b/lib/ext2fs/tst_libext2fs.c
index 1f63eb7..a90bff2 100644
--- a/lib/ext2fs/tst_libext2fs.c
+++ b/lib/ext2fs/tst_libext2fs.c
@@ -37,8 +37,8 @@ static int print_blocks_proc(ext2_filsys fs EXT2FS_ATTR((unused)),
 			     blk64_t ref_block, int ref_offset,
 			     void *private EXT2FS_ATTR((unused)))
 {
-	printf("%6d %8llu (%d %llu)\n", blockcnt, *blocknr,
-	       ref_offset, ref_block);
+	printf("%6lld %8llu (%d %llu)\n", (long long) blockcnt,
+	       (unsigned long long)*blocknr, ref_offset, ref_block);
 	return 0;
 }
 
diff --git a/misc/util.c b/misc/util.c
index 7e91509..8d02ab2 100644
--- a/misc/util.c
+++ b/misc/util.c
@@ -28,6 +28,9 @@
 #ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>
 #endif
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
 #include <time.h>
 
 #include "et/com_err.h"
@@ -87,7 +90,7 @@ void proceed_question(int delay)
 	if (delay > 0) {
 		if (setjmp(alarm_env)) {
 			signal(SIGALRM, SIG_IGN);
-			printf(_("<proceeding>\n"));
+			printf("%s", _("<proceeding>\n"));
 			return;
 		}
 		signal(SIGALRM, alarm_signal);
-- 
1.8.3.1