Fix warning messages after merge with gawk_performance.

6 files changed, 14 insertions, 13 deletions

diff --git a/ChangeLog b/ChangeLog
index 0c3d0c00..b6b38283 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2011-10-25         Arnold D. Robbins     <arnold@skeeve.com>
+
+	Merge with gawk_performance branch done. Additionally:
+
+	* cint_array.c, int_array.c, str_array.c: Fix compiler complaints
+	about printf formats (signed / unsigned vs. %d / %u).
+	* eval.c (setup_frame): Add a missing return value.
+
 2011-09-30  Eli Zaretskii  <eliz@gnu.org>
 
 	* io.c (remap_std_file): Fix non-portable code that caused
diff --git a/cint_array.c b/cint_array.c
index 72cd7370..bdda1117 100644
--- a/cint_array.c
+++ b/cint_array.c
@@ -1011,7 +1011,7 @@ tree_print(NODE *tree, size_t bi, int indent_level)
 	hsize = tree->array_size;
 	if ((tree->flags & HALFHAT) != 0)
 		hsize /= 2;
-	fprintf(output_fp, "%4d:%s[%4lu:%-4lu]\n", bi,
+	fprintf(output_fp, "%4u:%s[%4lu:%-4lu]\n", bi,
 			(tree->flags & HALFHAT) ? "HH" : "H",
 			(unsigned long) hsize, (unsigned long) tree->table_size);
 
@@ -1225,7 +1225,7 @@ static void
 leaf_print(NODE *array, size_t bi, int indent_level)
 {
 	indent(indent_level);
-	fprintf(output_fp, "%4d:L[%4lu:%-4lu]\n", bi,
+	fprintf(output_fp, "%4u:L[%4lu:%-4lu]\n", bi,
 			(unsigned long) array->array_size,
 			(unsigned long) array->table_size);
 }
diff --git a/configure b/configure
index b4d5e89c..9bb85fd1 100755
--- a/configure
+++ b/configure
@@ -748,15 +748,8 @@ LDFLAGS
 LIBS
 CPPFLAGS
 CPP
-CPPFLAGS
 YACC
-YFLAGS
-CC
-LDFLAGS
-LIBS
-CPPFLAGS
-CPP
-CPPFLAGS'
+YFLAGS'
 
 
 # Initialize some variables set by options.
diff --git a/eval.c b/eval.c
index daba0a0d..1804cf8e 100644
--- a/eval.c
+++ b/eval.c
@@ -1357,7 +1357,7 @@ setup_frame(INSTRUCTION *pc)
 
 	if (tail_optimize) {
 		frame_ptr->num_tail_calls++;
-		return;
+		return f->code_ptr;
 	}
 
 	if (pc->opcode == Op_indirect_func_call) {
diff --git a/int_array.c b/int_array.c
index 7bbfb585..9d852736 100644
--- a/int_array.c
+++ b/int_array.c
@@ -582,7 +582,7 @@ int_dump(NODE *symbol, NODE *ndump)
 		fprintf(output_fp, "flags: %s\n", flags2str(symbol->flags));
 	}
 	indent(indent_level);
-	fprintf(output_fp, "INT_CHAIN_MAX: %d\n", INT_CHAIN_MAX);
+	fprintf(output_fp, "INT_CHAIN_MAX: %u\n", INT_CHAIN_MAX);
 	indent(indent_level);
 	fprintf(output_fp, "array_size: %lu (int)\n", (unsigned long) symbol->array_size);
 	indent(indent_level);
diff --git a/str_array.c b/str_array.c
index 330280a6..f7f35ef3 100644
--- a/str_array.c
+++ b/str_array.c
@@ -443,7 +443,7 @@ str_dump(NODE *symbol, NODE *ndump)
 		fprintf(output_fp, "flags: %s\n", flags2str(symbol->flags));
 	}
 	indent(indent_level);
-	fprintf(output_fp, "STR_CHAIN_MAX: %d\n", STR_CHAIN_MAX);
+	fprintf(output_fp, "STR_CHAIN_MAX: %u\n", STR_CHAIN_MAX);
 	indent(indent_level);
 	fprintf(output_fp, "array_size: %lu\n", (unsigned long) symbol->array_size);
 	indent(indent_level);