From nobody Tue Aug 2 13:39:10 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Lxx0t4cshz4Y7l7; Tue, 2 Aug 2022 13:39:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Lxx0t46Frz3V2t; Tue, 2 Aug 2022 13:39:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659447550; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cOfg+emq6e2Mf59lRASoOJESms/+5WI4fbk20ea14IA=; b=OD9ZwgYXgpY4IdRTWWEV5r7ysi1MAXJruYoYyFbuaOip36kOgTJop8NvjoLgPz0hdiE6pP t6YHcwNdsLp4JY+NDwWgT5LpSSdjTRF4EeV3sgv57wGGj6zdNlNZzphJbsM1PKnl0BYlW5 0Vhg49e/WtxXWoJj/wYPMZoFmW2KhMH+Cc+yhnTJnbOzB176Oj9wmVXTQwL7WTU2bv5x8m 6v/THytvOy29YGnzIlUaZw8kzBw0MZwDja7tlPsCpr1sALoaa+s3+rSP0GQQpSLOUPsKem /TQx5lzHGYp4/Uxv8WgFoAUSYWwo2RY/zZqjoIFVgwpPn/+aDfYpbkvQAl/vQA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Lxx0t38dmzDmS; Tue, 2 Aug 2022 13:39:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 272DdAt2020801; Tue, 2 Aug 2022 13:39:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 272DdA3Q020800; Tue, 2 Aug 2022 13:39:10 GMT (envelope-from git) Date: Tue, 2 Aug 2022 13:39:10 GMT Message-Id: <202208021339.272DdA3Q020800@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Tom Jones Subject: git: 264a559ac827 - main - diff3: Simplify startmark calculation in Ascript List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: thj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 264a559ac827d0bf81986cd5758594fc687d5bd5 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659447550; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cOfg+emq6e2Mf59lRASoOJESms/+5WI4fbk20ea14IA=; b=qhnY5HIC9L/JrDnfenHpJ+A9vqttW4JYVUTZw72NSz5ucucomQKZsiTwMFVGEImaMVh4BK LDnlBuDTnxGeAqt7DS4moGvl4AlL08RlrM++5tNPOly/lDcfWlhycwwTm/LzIFyKyJIh2U 2RATgM/RlC8dS/ZBrl4zT32d7bpN0F5aCZ44W8BKKm56Ig4dUf5YHTJl6GI2S+aq72eT9E QmbBL/4KDQ78GMWP4/05aXhlskwvH1xvK24g/iJh8VDgIrPcuj7L3oA8diKHPv35euUOED KQ4J7ZAC3XEHT1foqlR241xvySTBfv5aOu9g4x46qSPbSITWb23p3IG5t9Ng2w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1659447550; a=rsa-sha256; cv=none; b=xIilI7eZ20CINaXSk8NWamsdVB5bl8FE55Ghk17u5WMgrHcxaiTAMexx2UJ2u6EJIxIAj0 bWYYxI8eix/IaRkgbwagtTnFyQcW8fXAEUPr23+OAjqR6+Y0MGxbfNwhUF6/X1gVMzxUqA mvl/UcanX0h0Rychbw7CcAGAIN5a0XF6TX2nIlbe99knnCPbrkDgSLmqFpGqWyn31OjW8u fpcKAwGMYXteMkvQKw2qHqxVsQimV7NrceE/spMLg7vhdsqy3OSCCR+nOdMRuQJtgaYbH4 zXc5xoCnEQG0HE3lthlzFWnbApcuyTNpApW4TZk7+s1ekxKLSemmuwKjaZhukg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by thj: URL: https://cgit.FreeBSD.org/src/commit/?id=264a559ac827d0bf81986cd5758594fc687d5bd5 commit 264a559ac827d0bf81986cd5758594fc687d5bd5 Author: Tom Jones AuthorDate: 2022-08-02 13:23:10 +0000 Commit: Tom Jones CommitDate: 2022-08-02 13:36:05 +0000 diff3: Simplify startmark calculation in Ascript Remove redundant calculation for startmark. Sponsored by: Klara, Inc. --- usr.bin/diff3/diff3.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/usr.bin/diff3/diff3.c b/usr.bin/diff3/diff3.c index ff8d03007e4e..37a98a635742 100644 --- a/usr.bin/diff3/diff3.c +++ b/usr.bin/diff3/diff3.c @@ -638,14 +638,13 @@ Ascript(int n) old = &de[n].old; deletenew = (new->from == new->to); deleteold = (old->from == old->to); - startmark = old->from + (old->to - old->from) - 1; if (de[n].type == DIFF_TYPE2) { if (!oflag || !overlap[n]) { prange(old, deletenew); printrange(fp[2], new); } else { - startmark = new->from + (new->to - new->from); + startmark = new->to; if (!deletenew) startmark--; @@ -664,6 +663,8 @@ Ascript(int n) } } else if (de[n].type == DIFF_TYPE3) { + startmark = old->to - 1; + if (!oflag || !overlap[n]) { prange(old, deletenew); printrange(fp[2], new);