Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 3 Jun 2019 05:25:16 +0000 (UTC)
From:      Warner Losh <imp@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r348526 - head/contrib/one-true-awk
Message-ID:  <201906030525.x535PGFk054912@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: imp
Date: Mon Jun  3 05:25:16 2019
New Revision: 348526
URL: https://svnweb.freebsd.org/changeset/base/348526

Log:
  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.

Modified:
  head/contrib/one-true-awk/run.c

Modified: head/contrib/one-true-awk/run.c
==============================================================================
--- head/contrib/one-true-awk/run.c	Mon Jun  3 05:15:36 2019	(r348525)
+++ head/contrib/one-true-awk/run.c	Mon Jun  3 05:25:16 2019	(r348526)
@@ -1387,9 +1387,6 @@ Cell *split(Node **a, int nnn)	/* split(a[0], a[1], a[
 	tempfree(y);
 	free(origs);
 	free(origfs);
-	if (a[2] != NULL && arg3type == STRING) {
-		tempfree(x);
-	}
 	x = gettemp();
 	x->tval = NUM;
 	x->fval = n;



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201906030525.x535PGFk054912>