More message updates.

6 files changed, 29 insertions, 20 deletions

diff --git a/ChangeLog b/ChangeLog
index 323018ab..800d591d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2020-03-11         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* main.c: Further message update. Thanks again to
+	Roland Illig <roland.illig@gmx.de>.
+
 2020-03-09         Andrew J. Schorr      <aschorr@telemetry-investments.com>
 
 	* array.c (sort_up_value_string): If either arg is not a Node_val,
diff --git a/extension/ChangeLog b/extension/ChangeLog
index 56b7da34..6ce0fdc7 100644
--- a/extension/ChangeLog
+++ b/extension/ChangeLog
@@ -1,3 +1,7 @@
+2020-03-11         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* filefuncs.c, ordchr.c, rwarray.c, rwarray0.c: Message updates.
+
 2020-03-06         Jannick               <thirdedition@gmx.net>
 
 	* Makefile.am: Remove trailing spaces.
diff --git a/extension/filefuncs.c b/extension/filefuncs.c
index c47a2d57..9078c107 100644
--- a/extension/filefuncs.c
+++ b/extension/filefuncs.c
@@ -845,19 +845,19 @@ do_fts(int nargs, awk_value_t *result, struct awk_ext_func *unused)
 		lintwarn(ext_id, _("fts: called with incorrect number of arguments, expecting 3"));
 
 	if (! get_argument(0, AWK_ARRAY, & pathlist)) {
-		warning(ext_id, _("fts: first parameter is not an array"));
+		warning(ext_id, _("fts: first argument is not an array"));
 		update_ERRNO_int(EINVAL);
 		goto out;
 	}
 
 	if (! get_argument(1, AWK_NUMBER, & flagval)) {
-		warning(ext_id, _("fts: second parameter is not a number"));
+		warning(ext_id, _("fts: second argument is not a number"));
 		update_ERRNO_int(EINVAL);
 		goto out;
 	}
 
 	if (! get_argument(2, AWK_ARRAY, & dest)) {
-		warning(ext_id, _("fts: third parameter is not an array"));
+		warning(ext_id, _("fts: third argument is not an array"));
 		update_ERRNO_int(EINVAL);
 		goto out;
 	}
diff --git a/extension/rwarray.c b/extension/rwarray.c
index 0300dcaa..777eb41c 100644
--- a/extension/rwarray.c
+++ b/extension/rwarray.c
@@ -116,13 +116,13 @@ do_writea(int nargs, awk_value_t *result, struct awk_ext_func *unused)
 
 	/* filename is first arg, array to dump is second */
 	if (! get_argument(0, AWK_STRING, & filename)) {
-		fprintf(stderr, _("do_writea: first argument is not a string\n"));
+		warning(ext_id, _("do_writea: first argument is not a string"));
 		errno = EINVAL;
 		goto done1;
 	}
 
 	if (! get_argument(1, AWK_ARRAY, & array)) {
-		fprintf(stderr, _("do_writea: second argument is not an array\n"));
+		warning(ext_id, _("do_writea: second argument is not an array"));
 		errno = EINVAL;
 		goto done1;
 	}
@@ -169,7 +169,7 @@ write_array(FILE *fp, awk_array_t array)
 	awk_flat_array_t *flat_array;
 
 	if (! flatten_array(array, & flat_array)) {
-		fprintf(stderr, _("write_array: could not flatten array\n"));
+		warning(ext_id, _("write_array: could not flatten array"));
 		return awk_false;
 	}
 
@@ -185,7 +185,7 @@ write_array(FILE *fp, awk_array_t array)
 	}
 
 	if (! release_flattened_array(array, flat_array)) {
-		fprintf(stderr, _("write_array: could not release flattened array\n"));
+		warning(ext_id, _("write_array: could not release flattened array"));
 		return awk_false;
 	}
 
@@ -289,13 +289,13 @@ do_reada(int nargs, awk_value_t *result, struct awk_ext_func *unused)
 
 	/* directory is first arg, array to read is second */
 	if (! get_argument(0, AWK_STRING, & filename)) {
-		fprintf(stderr, _("do_reada: first argument is not a string\n"));
+		warning(ext_id, _("do_reada: first argument is not a string"));
 		errno = EINVAL;
 		goto done1;
 	}
 
 	if (! get_argument(1, AWK_ARRAY, & array)) {
-		fprintf(stderr, _("do_reada: second argument is not an array\n"));
+		warning(ext_id, _("do_reada: second argument is not an array"));
 		errno = EINVAL;
 		goto done1;
 	}
@@ -339,7 +339,7 @@ do_reada(int nargs, awk_value_t *result, struct awk_ext_func *unused)
 
 	if (! clear_array(array.array_cookie)) {
 		errno = ENOMEM;
-		fprintf(stderr, _("do_reada: clear_array failed\n"));
+		warning(ext_id, _("do_reada: clear_array failed"));
 		goto done1;
 	}
 
@@ -376,7 +376,7 @@ read_array(FILE *fp, awk_array_t array)
 		if (read_elem(fp, & new_elem)) {
 			/* add to array */
 			if (! set_array_element_by_elem(array, & new_elem)) {
-				fprintf(stderr, _("read_array: set_array_element failed\n"));
+				warning(ext_id, _("read_array: set_array_element failed"));
 				return awk_false;
 			}
 		} else
diff --git a/extension/rwarray0.c b/extension/rwarray0.c
index 726570db..d343cdd2 100644
--- a/extension/rwarray0.c
+++ b/extension/rwarray0.c
@@ -111,13 +111,13 @@ do_writea(int nargs, awk_value_t *result, struct awk_ext_func *unused)
 
 	/* directory is first arg, array to dump is second */
 	if (! get_argument(0, AWK_STRING, & filename)) {
-		fprintf(stderr, _("do_writea: argument 0 is not a string\n"));
+		warning(ext_id, _("do_writea: argument 0 is not a string"));
 		errno = EINVAL;
 		goto done1;
 	}
 
 	if (! get_argument(1, AWK_ARRAY, & array)) {
-		fprintf(stderr, _("do_writea: argument 1 is not an array\n"));
+		warning(ext_id, _("do_writea: argument 1 is not an array"));
 		errno = EINVAL;
 		goto done1;
 	}
@@ -164,7 +164,7 @@ write_array(int fd, awk_array_t array)
 	awk_flat_array_t *flat_array;
 
 	if (! flatten_array(array, & flat_array)) {
-		fprintf(stderr, _("write_array: could not flatten array\n"));
+		warning(ext_id, _("write_array: could not flatten array"));
 		return awk_false;
 	}
 
@@ -178,7 +178,7 @@ write_array(int fd, awk_array_t array)
 	}
 
 	if (! release_flattened_array(array, flat_array)) {
-		fprintf(stderr, _("write_array: could not release flattened array\n"));
+		warning(ext_id, _("write_array: could not release flattened array"));
 		return awk_false;
 	}
 
@@ -264,13 +264,13 @@ do_reada(int nargs, awk_value_t *result, struct awk_ext_func *unused)
 
 	/* directory is first arg, array to read is second */
 	if (! get_argument(0, AWK_STRING, & filename)) {
-		fprintf(stderr, _("do_reada: argument 0 is not a string\n"));
+		warning(ext_id, _("do_reada: argument 0 is not a string"));
 		errno = EINVAL;
 		goto done1;
 	}
 
 	if (! get_argument(1, AWK_ARRAY, & array)) {
-		fprintf(stderr, _("do_reada: argument 1 is not an array\n"));
+		warning(ext_id, _("do_reada: argument 1 is not an array"));
 		errno = EINVAL;
 		goto done1;
 	}
@@ -314,7 +314,7 @@ do_reada(int nargs, awk_value_t *result, struct awk_ext_func *unused)
 
 	if (! clear_array(array.array_cookie)) {
 		errno = ENOMEM;
-		fprintf(stderr, _("do_reada: clear_array failed\n"));
+		warning(ext_id, _("do_reada: clear_array failed"));
 		goto done1;
 	}
 
@@ -350,7 +350,7 @@ read_array(int fd, awk_array_t array)
 		if (read_elem(fd, & new_elem)) {
 			/* add to array */
 			if (! set_array_element_by_elem(array, & new_elem)) {
-				fprintf(stderr, _("read_array: set_array_element failed\n"));
+				warning(ext_id, _("read_array: set_array_element failed"));
 				return awk_false;
 			}
 		} else
diff --git a/main.c b/main.c
index e49730a7..4f239dfc 100644
--- a/main.c
+++ b/main.c
@@ -645,7 +645,7 @@ By default it reads standard input and writes standard output.\n\n"), fp);
 
 	/* ditto */
 	fprintf(fp, _("Examples:\n\t%s '{ sum += $1 }; END { print sum }' file\n\
-\tgawk -F: '{ print $1 }' /etc/passwd\n"), myname);
+\t%s -F: '{ print $1 }' /etc/passwd\n"), myname, myname);
 
 	fflush(fp);