Merge branch 'master' into comment

7 files changed, 37 insertions, 5 deletions

diff --git a/extension/ChangeLog b/extension/ChangeLog
index f0b7baba..48830259 100644
--- a/extension/ChangeLog
+++ b/extension/ChangeLog
@@ -1,3 +1,21 @@
+2013-08-22         Arnold D. Robbins     <arnold@skeeve.com>
+
+	Clean up some warnings from -Wextra.
+
+	* gawkfts.c (fts_set): Add cast to void for sp.
+	* inplace.c (at_exit): Add cast to void for data and exit_status.
+	* readdir.c (ftype): Add cast to void for dirname.
+	(dir_get_record): Assign NULL to *rt_start.
+	* revtwoway.c (rev2way_get_record): Add cast to void for errcode.
+	(rev2way_fwrite): Add cast to void for fp.
+	(rev2way_take_control_of): Add cast to void for name.
+	* testext.c (test_array_param, test_scalar, test_scalar_reserved,
+	test_indirect_vars): Add cast to void for nargs.
+
+2013-08-20         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* gawkdirfd.h: Include ../nonposix.h to get FAKE_FD_VALUE.
+
 2013-08-06         Arnold D. Robbins     <arnold@skeeve.com>
 
 	* filefuncs.c: Change _WIN32 to __MINGW32__ globally, per
diff --git a/extension/gawkdirfd.h b/extension/gawkdirfd.h
index 4710dab4..a3a2b6a6 100644
--- a/extension/gawkdirfd.h
+++ b/extension/gawkdirfd.h
@@ -29,11 +29,13 @@
  * This is for fake directory file descriptors on systems that don't
  * allow to open() a directory.
  *
- * It would be nice if this could be shared with the definition in awk.h
- * in the main code base, but there's not a very clean way to do that,
- * at least that I can see.
+ * Including a header from the main gawk source to share the definition
+ * of FAKE_FD_VALUE is the least of all evils that I can see.
+ *
+ * Unlike the main gawk code base, this include is NOT dependant
+ * upon MinGW or EMX.
  */
-#define FAKE_FD_VALUE 42
+#include "../nonposix.h"
 
 #ifndef DIR_TO_FD
 # define DIR_TO_FD(d) (FAKE_FD_VALUE)
diff --git a/extension/gawkfts.c b/extension/gawkfts.c
index 734dd7f7..81803b88 100644
--- a/extension/gawkfts.c
+++ b/extension/gawkfts.c
@@ -554,7 +554,7 @@ name:		t = sp->fts_path + NAPPEND(p->fts_parent);
 int
 fts_set(FTS *sp, FTSENT *p, int instr)
 {
-
+	(void) sp;	/* silence warnings */
 	_DIAGASSERT(sp != NULL);
 	_DIAGASSERT(p != NULL);
 
diff --git a/extension/inplace.c b/extension/inplace.c
index ad6f0e23..133b40f0 100644
--- a/extension/inplace.c
+++ b/extension/inplace.c
@@ -88,6 +88,8 @@ static struct {
 static void
 at_exit(void *data, int exit_status)
 {
+	(void) data;		/* silence warnings */
+	(void) exit_status;	/* silence warnings */
 	if (state.tname) {
 		unlink(state.tname);
 		free(state.tname);
diff --git a/extension/readdir.c b/extension/readdir.c
index 061fe27f..91296801 100644
--- a/extension/readdir.c
+++ b/extension/readdir.c
@@ -89,6 +89,7 @@ static const char *
 ftype(struct dirent *entry, const char *dirname)
 {
 #ifdef DT_BLK
+	(void) dirname;		/* silence warnings */
 	switch (entry->d_type) {
 	case DT_BLK:	return "b";
 	case DT_CHR:	return "c";
@@ -158,6 +159,7 @@ get_inode(struct dirent *entry, const char *dirname)
 	}
 	return 0;
 #else
+	(void) dirname;		/* silence warnings */
 	return entry->d_ino;
 #endif
 }
@@ -215,6 +217,7 @@ dir_get_record(char **out, awk_input_buf_t *iobuf, int *errcode,
 
 	*out = the_dir->buf;
 
+	*rt_start = NULL;
 	*rt_len = 0;	/* set RT to "" */
 	return len;
 }
diff --git a/extension/revtwoway.c b/extension/revtwoway.c
index 6e5bb710..5f490825 100644
--- a/extension/revtwoway.c
+++ b/extension/revtwoway.c
@@ -141,6 +141,7 @@ rev2way_get_record(char **out, awk_input_buf_t *iobuf, int *errcode,
 	 * error occurs.
 	 */
 
+	(void) errcode;		/* silence warnings */
 	if (out == NULL || iobuf == NULL || iobuf->opaque == NULL)
 		return EOF;
 
@@ -195,6 +196,7 @@ rev2way_fwrite(const void *buf, size_t size, size_t count, FILE *fp, void *opaqu
 	size_t amount, char_count;
 	char *src, *dest;
 
+	(void) fp;	/* silence warnings */
 	if (opaque == NULL)
 		return 0;	/* error */
 
@@ -281,6 +283,7 @@ revtwoway_take_control_of(const char *name, awk_input_buf_t *inbuf, awk_output_b
 {
 	two_way_proc_data_t *proc_data;
 
+	(void) name;	/* silence warnings */
 	if (inbuf == NULL || outbuf == NULL)
 		return awk_false;
 
diff --git a/extension/testext.c b/extension/testext.c
index df159575..d11272b8 100644
--- a/extension/testext.c
+++ b/extension/testext.c
@@ -537,6 +537,7 @@ test_array_param(int nargs, awk_value_t *result)
 	awk_value_t new_array;
 	awk_value_t arg0;
 
+	(void) nargs;		/* silence warnings */
 	make_number(0.0, result);
 
 	if (! get_argument(0, AWK_UNDEFINED, & arg0)) {
@@ -615,6 +616,7 @@ test_scalar(int nargs, awk_value_t *result)
 	awk_value_t new_value, new_value2;
 	awk_value_t the_scalar;
 
+	(void) nargs;		/* silence warnings */
 	make_number(0.0, result);
 
 	if (! sym_lookup("the_scalar", AWK_SCALAR, & the_scalar)) {
@@ -661,6 +663,7 @@ test_scalar_reserved(int nargs, awk_value_t *result)
 	awk_value_t new_value;
 	awk_value_t the_scalar;
 
+	(void) nargs;		/* silence warnings */
 	make_number(0.0, result);
 
 	/* look up a reserved variable - should pass */
@@ -712,6 +715,7 @@ test_indirect_vars(int nargs, awk_value_t *result)
 	awk_value_t value;
 	char *name = "NR";
 
+	(void) nargs;		/* silence warnings */
 	assert(result != NULL);
 	make_number(0.0, result);