Merge branch 'gawk-4.1-stable'

6 files changed, 24 insertions, 11 deletions

diff --git a/ChangeLog b/ChangeLog
index b199e739..b4f65ac9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,18 @@
 2017-07-07         Arnold D. Robbins     <arnold@skeeve.com>
 
+	Remove warnings from GCC 7.1 compilation.
+
+	* awk.h (fatal_tag_valid): Change type to int.
+	* awkgram.y (yylex): Set did_newline to true instead of using ++.
+	* builtin.c (format_tree): Set lj to true instead of using ++.
+	* cmd.h (pager_quit_tag_valid): Change type to int.
+	* debug.c (pager_quit_tag_valid): Change type to int.
+	(do_clear): Make bp_found an int, change uses.
+	(do_run): Treat fatal_tag_valid as an int.
+	* msg.c (fatal_tag_valid): Change type to int.
+
+2017-07-07         Arnold D. Robbins     <arnold@skeeve.com>
+
 	* gawapi.h: Bring descriptive comments up to date, minor edits.
 	* io.c: Add some initial comments to functions where they were missing.
 
diff --git a/awk.h b/awk.h
index 1ed5a4ef..3edfe5bd 100644
--- a/awk.h
+++ b/awk.h
@@ -1340,7 +1340,7 @@ DEREF(NODE *r)
 #define fatal		(*(set_loc(__FILE__, __LINE__), r_fatal))
 
 extern jmp_buf fatal_tag;
-extern bool fatal_tag_valid;
+extern int fatal_tag_valid;
 
 #define PUSH_BINDING(stack, tag, val)	\
 if (val++) \
diff --git a/builtin.c b/builtin.c
index 724be058..b642e648 100644
--- a/builtin.c
+++ b/builtin.c
@@ -965,7 +965,7 @@ check_pos:
 			*cur = get_number_si(arg);
 			if (*cur < 0 && cur == &fw) {
 				*cur = -*cur;
-				lj++;
+				lj = true;
 			}
 			if (cur == &prec) {
 				if (*cur >= 0)
@@ -992,7 +992,7 @@ check_pos:
 				goto retry;
 			}
 			fill = sp;      /* if left justified then other */
-			lj++; 		/* filling is ignored */
+			lj = true;	/* filling is ignored */
 			goto check_pos;
 		case '.':
 			if (cur != &fw)
diff --git a/cmd.h b/cmd.h
index 4313a6fd..c87d9640 100644
--- a/cmd.h
+++ b/cmd.h
@@ -36,7 +36,7 @@ extern NODE *get_function(void);
 
 extern int gprintf(FILE *fp, const char *format, ...);
 extern jmp_buf pager_quit_tag;
-extern bool pager_quit_tag_valid;
+extern int pager_quit_tag_valid;
 
 extern bool output_is_tty;
 extern int input_fd;
diff --git a/debug.c b/debug.c
index c3bc3009..1e04e233 100644
--- a/debug.c
+++ b/debug.c
@@ -270,7 +270,7 @@ static void save_options(const char *file);
 
 /* pager */
 jmp_buf pager_quit_tag;
-bool pager_quit_tag_valid = false;
+int pager_quit_tag_valid = 0;
 static int screen_width = INT_MAX;	/* no of columns */
 static int screen_height = INT_MAX;	/* no of rows */
 static int pager_lines_printed = 0;	/* no of lines printed so far */
@@ -2459,7 +2459,7 @@ do_clear(CMDARG *arg, int cmd ATTRIBUTE_UNUSED)
 	NODE *func;
 	SRCFILE *s = cur_srcfile;
 	char *src = cur_srcfile->src;
-	bool bp_found = false;
+	int bp_found = 0;
 
 	if (arg == NULL) {	/* clear */
 		CHECK_PROG_RUNNING();
@@ -2511,7 +2511,7 @@ func:
 				fprintf(out_fp, ", %d", b->number);
 			delete_breakpoint(b);
 		}
-		if (! bp_found)
+		if (bp_found == 0)
 			fprintf(out_fp, _("No breakpoint(s) at entry to function `%s'\n"),
 					func->vname);
 		else
@@ -2538,7 +2538,7 @@ delete_bp:
 		}
 	}
 
-	if (! bp_found)
+	if (bp_found == 0)
 		fprintf(out_fp, _("No breakpoint at file `%s', line #%d\n"),
 					src, (int) lineno);
 	else
@@ -2955,11 +2955,11 @@ do_run(CMDARG *arg ATTRIBUTE_UNUSED, int cmd ATTRIBUTE_UNUSED)
 	fprintf(out_fp, _("Starting program: \n"));
 
 	prog_running = true;
-	fatal_tag_valid = true;
+	fatal_tag_valid = 1;
 	if (setjmp(fatal_tag) == 0)
 		(void) interpret(code_block);
 
-	fatal_tag_valid = false;
+	fatal_tag_valid = 0;
 	prog_running = false;
 	fprintf(out_fp, (! exiting && exit_val != EXIT_SUCCESS)
 				? _("Program exited abnormally with exit value: %d\n")
diff --git a/msg.c b/msg.c
index 12fc18f5..2902a48b 100644
--- a/msg.c
+++ b/msg.c
@@ -33,7 +33,7 @@ static const char *srcfile = NULL;
 static int srcline;
 
 jmp_buf fatal_tag;
-bool fatal_tag_valid = false;
+int fatal_tag_valid = 0;
 
 /* err --- print an error message with source line and file and record */