diff options
| author | Arnold D. Robbins <arnold@skeeve.com> | 2020-03-10 09:42:23 +0200 |
|---|---|---|
| committer | Arnold D. Robbins <arnold@skeeve.com> | 2020-03-10 09:42:23 +0200 |
| commit | 0add33f3c3e8e8a5a735b6a1b779d91ee3884246 (patch) | |
| tree | dbe90aa5ab46d5065b21754ea2ec042d62f68951 /extension/filefuncs.c | |
| parent | 2f0eddafa9a66aebf2e2ed1c49a9e8ce9e892a8c (diff) | |
| download | egawk-0add33f3c3e8e8a5a735b6a1b779d91ee3884246.tar.gz egawk-0add33f3c3e8e8a5a735b6a1b779d91ee3884246.tar.bz2 egawk-0add33f3c3e8e8a5a735b6a1b779d91ee3884246.zip | |
Second round of message fixes.
Diffstat (limited to 'extension/filefuncs.c')
| -rw-r--r-- | extension/filefuncs.c | 23 |
1 files changed, 12 insertions, 11 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) { |