diff options
author | Warner Losh <imp@FreeBSD.org> | 2019-06-03 05:25:16 +0000 |
---|---|---|
committer | Warner Losh <imp@FreeBSD.org> | 2019-06-03 05:25:16 +0000 |
commit | 31d232c2a3c18fb05e5b2f1ec42872708cbfd27e (patch) | |
tree | 8d7b5dfcf14b853d4675c6665605d9e6bbbbc64c /contrib | |
parent | 2d5039db182b096ae9293141aabbc17ca2c69638 (diff) | |
download | src-31d232c2a3c18fb05e5b2f1ec42872708cbfd27e.tar.gz src-31d232c2a3c18fb05e5b2f1ec42872708cbfd27e.zip |
Fix mismerge that crept into r301289.
The conversion of 0 -> NULL required a rebase at some point, as noted
in r301289 when pfg commited it. In that rebase, three lines remained
that had been removed in a prior version of awk, and one of them had a
0 -> NULL change causing a conflict. The conflict should have been
resolved by removing the three lines, but wasn't. This introduces a
regression into f.split3 test which prior to this commit we were
failing, but a pure onetrueawk wasn't. Remove the offending 3 lines.
Notes
Notes:
svn path=/head/; revision=348526
Diffstat (limited to 'contrib')
-rw-r--r-- | contrib/one-true-awk/run.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/contrib/one-true-awk/run.c b/contrib/one-true-awk/run.c index d74b54ca3445..1859263f7f4b 100644 --- a/contrib/one-true-awk/run.c +++ b/contrib/one-true-awk/run.c @@ -1387,9 +1387,6 @@ Cell *split(Node **a, int nnn) /* split(a[0], a[1], a[2]); a[3] is type */ tempfree(y); free(origs); free(origfs); - if (a[2] != NULL && arg3type == STRING) { - tempfree(x); - } x = gettemp(); x->tval = NUM; x->fval = n; |