Second round of message fixes.

3 files changed, 18 insertions, 17 deletions

diff --git a/extension/filefuncs.c b/extension/filefuncs.c
index 828f68ac..c47a2d57 100644
--- a/extension/filefuncs.c
+++ b/extension/filefuncs.c
@@ -471,9 +471,13 @@ do_stat(int nargs, awk_value_t *result, struct awk_ext_func *unused)
 	assert(result != NULL);
 
 	/* file is first arg, array to hold results is second */
-	if (   ! get_argument(0, AWK_STRING, & file_param)
-	    || ! get_argument(1, AWK_ARRAY, & array_param)) {
-		warning(ext_id, _("stat: bad parameters"));
+	if (! get_argument(0, AWK_STRING, & file_param)) {
+		warning(ext_id, _("stat: first argument is not a string"));
+		return make_number(-1, result);
+	}
+
+	if (! get_argument(1, AWK_ARRAY, & array_param)) {
+		warning(ext_id, _("stat: second argument is not an array"));
 		return make_number(-1, result);
 	}
 
@@ -622,7 +626,7 @@ fill_stat_element(awk_array_t element_array, const char *name, struct stat *sbuf
 
 	stat_array = create_array();
 	if (stat_array == NULL) {
-		warning(ext_id, _("fill_stat_element: could not create array"));
+		warning(ext_id, _("fill_stat_element: could not create array, out of memory"));
 		fts_errors++;
 		return;
 	}
@@ -841,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: bad first parameter"));
+		warning(ext_id, _("fts: first parameter is not an array"));
 		update_ERRNO_int(EINVAL);
 		goto out;
 	}
 
 	if (! get_argument(1, AWK_NUMBER, & flagval)) {
-		warning(ext_id, _("fts: bad second parameter"));
+		warning(ext_id, _("fts: second parameter is not a number"));
 		update_ERRNO_int(EINVAL);
 		goto out;
 	}
 
 	if (! get_argument(2, AWK_ARRAY, & dest)) {
-		warning(ext_id, _("fts: bad third parameter"));
+		warning(ext_id, _("fts: third parameter is not an array"));
 		update_ERRNO_int(EINVAL);
 		goto out;
 	}
@@ -893,10 +897,7 @@ do_fts(int nargs, awk_value_t *result, struct awk_ext_func *unused)
 
 
 	/* clear dest array */
-	if (! clear_array(dest.array_cookie)) {
-		warning(ext_id, _("fts: clear_array() failed\n"));
-		goto out;
-	}
+	assert(clear_array(dest.array_cookie));
 
 	/* let's do it! */
 	if ((hierarchy = fts_open(pathvector, flags, NULL)) != NULL) {
diff --git a/extension/ordchr.c b/extension/ordchr.c
index d9543126..28d3e036 100644
--- a/extension/ordchr.c
+++ b/extension/ordchr.c
@@ -69,7 +69,7 @@ do_ord(int nargs, awk_value_t *result, struct awk_ext_func *unused)
 	if (get_argument(0, AWK_STRING, & str)) {
 		ret = str.str_value.str[0];
 	} else if (do_lint)
-		lintwarn(ext_id, _("ord: called with inappropriate argument(s)"));
+		lintwarn(ext_id, _("ord: first argument is not a string"));
 
 	/* Set the return value */
 	return make_number(ret, result);
@@ -96,7 +96,7 @@ do_chr(int nargs, awk_value_t *result, struct awk_ext_func *unused)
 		str[0] = ret;
 		str[1] = '\0';
 	} else if (do_lint)
-		lintwarn(ext_id, _("chr: called with inappropriate argument(s)"));
+		lintwarn(ext_id, _("chr: first argument is not a number"));
 
 	/* Set the return value */
 	return make_const_string(str, 1, result);
diff --git a/extension/rwarray.c b/extension/rwarray.c
index 9ba2dca4..0300dcaa 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: argument 0 is not a string\n"));
+		fprintf(stderr, _("do_writea: first argument is not a string\n"));
 		errno = EINVAL;
 		goto done1;
 	}
 
 	if (! get_argument(1, AWK_ARRAY, & array)) {
-		fprintf(stderr, _("do_writea: argument 1 is not an array\n"));
+		fprintf(stderr, _("do_writea: second argument is not an array\n"));
 		errno = EINVAL;
 		goto done1;
 	}
@@ -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: argument 0 is not a string\n"));
+		fprintf(stderr, _("do_reada: first argument is not a string\n"));
 		errno = EINVAL;
 		goto done1;
 	}
 
 	if (! get_argument(1, AWK_ARRAY, & array)) {
-		fprintf(stderr, _("do_reada: argument 1 is not an array\n"));
+		fprintf(stderr, _("do_reada: second argument is not an array\n"));
 		errno = EINVAL;
 		goto done1;
 	}