summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArnold D. Robbins <arnold@skeeve.com>2014-11-26 08:29:52 +0200
committerArnold D. Robbins <arnold@skeeve.com>2014-11-26 08:29:52 +0200
commit5dd46ec03bb3dc945d2f084726aaba79a83e6340 (patch)
tree95ed1d31e5b3851abbe0ea5e3ba1c8a6d9555662
parent7efd4d794abbbd1b6abc2110cd43fd7896e0cb47 (diff)
downloadgawk-5dd46ec03bb3dc945d2f084726aaba79a83e6340.tar.gz
Fixes for new gensub warnings.
-rw-r--r--ChangeLog4
-rw-r--r--builtin.c4
-rw-r--r--test/ChangeLog4
-rw-r--r--test/gensub2.ok1
4 files changed, 11 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 175c9298..5dc79045 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-11-26 Arnold D. Robbins <arnold@skeeve.com>
+
+ * builtin.c (do_sub): Improve wording of gensub warnings.
+
2014-11-25 Arnold D. Robbins <arnold@skeeve.com>
* builtin.c (do_sub): For gensub, add more warnings for invalid
diff --git a/builtin.c b/builtin.c
index 3aeee744..53210c4d 100644
--- a/builtin.c
+++ b/builtin.c
@@ -2696,7 +2696,7 @@ do_sub(int nargs, unsigned int flags)
if ((t1->flags & NUMCUR) != 0)
goto set_how_many;
- warning(_("gensub: third argument of `%.*s' treated as 1"),
+ warning(_("gensub: third argument `%.*s' treated as 1"),
(int) t1->stlen, t1->stptr);
how_many = 1;
}
@@ -2711,7 +2711,7 @@ set_how_many:
else
how_many = LONG_MAX;
if (d <= 0)
- warning(_("gensub: third argument of %g treated as 1"), d);
+ warning(_("gensub: third argument %g treated as 1"), d);
}
DEREF(t1);
diff --git a/test/ChangeLog b/test/ChangeLog
index 633fef51..854c1379 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,7 @@
+2014-11-26 Arnold D. Robbins <arnold@skeeve.com>
+
+ * gensub2.ok: Update after code changes.
+
2014-11-16 Arnold D. Robbins <arnold@skeeve.com>
* Makefile.am (sortglos): New test.
diff --git a/test/gensub2.ok b/test/gensub2.ok
index 89824140..318f940c 100644
--- a/test/gensub2.ok
+++ b/test/gensub2.ok
@@ -1,3 +1,4 @@
xy
xy
+gawk: gensub2.awk:4: warning: gensub: third argument `a' treated as 1
yx