diff options
| author | Arnold D. Robbins <arnold@skeeve.com> | 2016-07-08 14:17:02 +0300 |
|---|---|---|
| committer | Arnold D. Robbins <arnold@skeeve.com> | 2016-07-08 14:17:02 +0300 |
| commit | b80ffd11949d7b8cc69827a03d7219018ccc377b (patch) | |
| tree | b868490751bde3f1e2f0ef3be0e789ab3192d40a | |
| parent | 3cfe2b95425b707a68f7af789befbc51fdafcdfb (diff) | |
| parent | 55858266e4b310f34c6812e6ecb8f08fe3e5c582 (diff) | |
| download | egawk-b80ffd11949d7b8cc69827a03d7219018ccc377b.tar.gz egawk-b80ffd11949d7b8cc69827a03d7219018ccc377b.tar.bz2 egawk-b80ffd11949d7b8cc69827a03d7219018ccc377b.zip | |
Merge branch 'master' into feature/cmake
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | builtin.c | 7 |
2 files changed, 8 insertions, 3 deletions
@@ -2,6 +2,10 @@ * dfa.c: Sync with GNU grep. + Unrelated: + + * builtin.c (do_print): Coding style change. + 2016-07-03 Andrew J. Schorr <aschorr@telemetry-investments.com> * field.c (rebuild_record): Revert warning message regarding flags, @@ -2203,9 +2203,10 @@ do_print(int nargs, int redirtype) if (tmp->type == Node_typedregex) args_array[i] = force_string(tmp); - else if (!((tmp->flags & STRCUR) != 0 - && (tmp->stfmt == STFMT_UNUSED || tmp->stfmt == OFMTidx))) - args_array[i] = format_val(OFMT, OFMTidx, tmp); + else if ( (tmp->flags & STRCUR) == 0 + || ( tmp->stfmt != STFMT_UNUSED + && tmp->stfmt != OFMTidx)) + args_array[i] = format_val(OFMT, OFMTidx, tmp); } if (redir_exp != NULL) { |