aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog9
-rw-r--r--awk.h6
-rw-r--r--ext.c4
-rw-r--r--gawkapi.c6
4 files changed, 17 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 4b6e88db..59b96fac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2016-05-26 Andrew J. Schorr <aschorr@telemetry-investments.com>
+
+ * awk.h (get_actual_argument): Remove unused "optional" argument.
+ (get_scalar_argument, get_array_argument): Change macro definition to
+ remove 3rd "optional" argument.
+ * ext.c (get_actual_argument): Remove unused "optional" argument.
+ * gawkapi.c (api_get_argument, api_set_argument): Remove unused final
+ argument to get_array_argument and get_scalar_argument.
+
2016-05-26 Arnold D. Robbins <arnold@skeeve.com>
* awk.h [fatal]: Make parentheses and use of indirection
diff --git a/awk.h b/awk.h
index 8f3b1d48..7323b6ca 100644
--- a/awk.h
+++ b/awk.h
@@ -1441,9 +1441,9 @@ extern void close_extensions(void);
extern void make_old_builtin(const char *, NODE *(*)(int), int);
extern awk_bool_t make_builtin(const awk_ext_func_t *);
extern NODE *get_argument(int);
-extern NODE *get_actual_argument(NODE *, int, bool, bool);
-#define get_scalar_argument(n, i, opt) get_actual_argument((n), (i), (opt), false)
-#define get_array_argument(n, i, opt) get_actual_argument((n), (i), (opt), true)
+extern NODE *get_actual_argument(NODE *, int, bool);
+#define get_scalar_argument(n, i) get_actual_argument((n), (i), false)
+#define get_array_argument(n, i) get_actual_argument((n), (i), true)
#endif
/* field.c */
extern void init_fields(void);
diff --git a/ext.c b/ext.c
index c3e34b1c..0e6da3d3 100644
--- a/ext.c
+++ b/ext.c
@@ -330,11 +330,11 @@ get_argument(int i)
/*
* get_actual_argument --- get the i'th scalar or array argument of a
- * dynamically linked function, allowed to be optional.
+ * dynamically linked function.
*/
NODE *
-get_actual_argument(NODE *t, int i, bool optional, bool want_array)
+get_actual_argument(NODE *t, int i, bool want_array)
{
char *fname;
INSTRUCTION *pc;
diff --git a/gawkapi.c b/gawkapi.c
index 779506cd..45bbadb9 100644
--- a/gawkapi.c
+++ b/gawkapi.c
@@ -82,7 +82,7 @@ api_get_argument(awk_ext_id_t id, size_t count,
array:
/* get the array here */
- arg = get_array_argument(arg, count, false);
+ arg = get_array_argument(arg, count);
if (arg == NULL)
return awk_false;
@@ -90,7 +90,7 @@ array:
scalar:
/* at this point we have a real type that is not an array */
- arg = get_scalar_argument(arg, count, false);
+ arg = get_scalar_argument(arg, count);
if (arg == NULL)
return awk_false;
@@ -120,7 +120,7 @@ api_set_argument(awk_ext_id_t id,
|| arg->type != Node_var_new)
return awk_false;
- arg = get_array_argument(arg, count, false);
+ arg = get_array_argument(arg, count);
if (arg == NULL)
return awk_false;