diff options
| author | Arnold D. Robbins <arnold@skeeve.com> | 2018-01-10 22:14:27 +0200 |
|---|---|---|
| committer | Arnold D. Robbins <arnold@skeeve.com> | 2018-01-10 22:14:27 +0200 |
| commit | cc8c981c9eaed42e1afd278afac787cd2aeab55f (patch) | |
| tree | 66daeb2dc1049a6112445705f6b92cea55958bd7 /builtin.c | |
| parent | dd2516767fa58d56684e003f646ef6d611051a64 (diff) | |
| parent | 7d463f19f1fc98a7d4f99e3575c545ca7009d9db (diff) | |
| download | egawk-cc8c981c9eaed42e1afd278afac787cd2aeab55f.tar.gz egawk-cc8c981c9eaed42e1afd278afac787cd2aeab55f.tar.bz2 egawk-cc8c981c9eaed42e1afd278afac787cd2aeab55f.zip | |
Merge branch 'master' into feature/fix-comments
Diffstat (limited to 'builtin.c')
| -rw-r--r-- | builtin.c | 9 |
1 files changed, 4 insertions, 5 deletions
@@ -3,7 +3,7 @@ */ /* - * Copyright (C) 1986, 1988, 1989, 1991-2017 the Free Software Foundation, Inc. + * Copyright (C) 1986, 1988, 1989, 1991-2018 the Free Software Foundation, Inc. * * This file is part of GAWK, the GNU implementation of the * AWK Programming Language. @@ -2242,10 +2242,9 @@ do_print(int nargs, int redirtype) DEREF(args_array[i]); fatal(_("attempt to use array `%s' in a scalar context"), array_vname(tmp)); } - if ( (tmp->flags & STRCUR) == 0 - || ( tmp->stfmt != STFMT_UNUSED - && tmp->stfmt != OFMTidx)) - args_array[i] = force_string_ofmt(tmp); + // Let force_string_ofmt handle checking if things + // are already valid. + args_array[i] = force_string_ofmt(tmp); } if (redir_exp != NULL) { |