[SCM] gawk branch, master, updated. gawk-4.1.0-3915-g73e440b

[Arnold Robbins]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "gawk".

The branch, master has been updated
       via  73e440b988942a2933151bd9e0a1b78b9268d5bc (commit)
      from  c1929597bd14005486a7c1b07d7d706d36f473ad (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.sv.gnu.org/cgit/gawk.git/commit/?id=73e440b988942a2933151bd9e0a1b78b9268d5bc

commit 73e440b988942a2933151bd9e0a1b78b9268d5bc
Author: Arnold D. Robbins <address@hidden>
Date:   Wed Mar 11 08:29:41 2020 -0600

    More message updates.

diff --git a/ChangeLog b/ChangeLog
index 323018a..800d591 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2020-03-11         Arnold D. Robbins     <address@hidden>
+
+       * main.c: Further message update. Thanks again to
+       Roland Illig <address@hidden>.
+
 2020-03-09         Andrew J. Schorr      <address@hidden>
 
        * array.c (sort_up_value_string): If either arg is not a Node_val,
diff --git a/extension/ChangeLog b/extension/ChangeLog
index 56b7da3..6ce0fdc 100644
--- a/extension/ChangeLog
+++ b/extension/ChangeLog
@@ -1,3 +1,7 @@
+2020-03-11         Arnold D. Robbins     <address@hidden>
+
+       * filefuncs.c, ordchr.c, rwarray.c, rwarray0.c: Message updates.
+
 2020-03-06         Jannick               <address@hidden>
 
        * Makefile.am: Remove trailing spaces.
diff --git a/extension/filefuncs.c b/extension/filefuncs.c
index c47a2d5..9078c10 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 0300dca..777eb41 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 726570d..d343cdd 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 e49730a..4f239df 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);
 

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog             |  5 +++++
 extension/ChangeLog   |  4 ++++
 extension/filefuncs.c |  6 +++---
 extension/rwarray.c   | 16 ++++++++--------
 extension/rwarray0.c  | 16 ++++++++--------
 main.c                |  2 +-
 6 files changed, 29 insertions(+), 20 deletions(-)


hooks/post-receive
-- 
gawk