From nobody Tue Aug 02 13:39:12 2022 X-Original-To: dev-commits-src-main@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 4Lxx0x18C4z4Y7ZS; Tue, 2 Aug 2022 13:39:13 +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 4Lxx0w5ydcz3V87; Tue, 2 Aug 2022 13:39:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659447552; 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=K73iZfoSLm0w0b54CtZYA34t0oa/8uG2E7TA+FWp1DE=; b=gEE30jts0mihO0zZ+MzJCw5Qb+A0z3k0lceHUx0TX57m5hGvkPURuEd3jfKJs9gXUIaNwI 7gIMNOW5XtMWFPiFUGPq+zQDyn7real4QD7Hm3efcRHPnVxo2aCMBZtaWUdRQ+YGdlrFde hsCiq2/kQr2Mdp8lVTz2NwPhUIhq1hzqWvNeHT3suPGqfhrAxCE9hpPmAXIdLm132QjIPY o8FqLY60RuUWgyvKBL5MqfRx3OkbLdxTmqAM3ENMaBXPgA13yDXV2OCYXWs68LCQS4yNEW QCR+G/MFDrrx1eD+TRZv8nDqyE0MBE9Y5Z753KWpICnUzke9NHjGoRtAxdvJIQ== 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 4Lxx0w54pwzDpH; Tue, 2 Aug 2022 13:39:12 +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 272DdCKs020856; Tue, 2 Aug 2022 13:39:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 272DdCOe020855; Tue, 2 Aug 2022 13:39:12 GMT (envelope-from git) Date: Tue, 2 Aug 2022 13:39:12 GMT Message-Id: <202208021339.272DdCOe020855@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: 190c4c2499e6 - main - diff3: Use ranges for new and old diffedits in ed scripts List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 190c4c2499e64e1c88f25f68c2929d110d635300 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659447552; 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=K73iZfoSLm0w0b54CtZYA34t0oa/8uG2E7TA+FWp1DE=; b=x+6z6Lzk8DOhsrkUdeWoFCcmo0Ji31TtNH1v2FbChdEM++A8KdljyabcA3gAaq3yrYspmm z4I3mf+2Kg7UjG47I5mrh0RoAKyeEM6ykzzT/4F9z1Zz5pmMEG3iVVBL7CJ559XbmslaTc E1rGZfiLxPPJPD65/Y7gY2Wk5W0voyl6/3US7KUn+U6BV2UCgj9GZ2MmtqufW/sLK5v5Yv o9h4gPLd3W4ArvM6DCB95Uoj71/GogD2MZtzvUpzWqL32D4xewo8JwWS12cH7nfrMRFqQ9 +bMkqq7G8o5WG/XwHv01xUOphGn7vEVvJHL5kVevQLk2VT31Nr9qdll+OjmRDQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1659447552; a=rsa-sha256; cv=none; b=lHlRp1acu7zVMlp6g7UPbRQzNNsIVhhrPSZsDnD6U7LDXTg3DlD688BLZkHBICZ5hdQI7t Jhr5HU9ySWB6wdhg7HEs2i5r1E0NQMU0OBuSSZFcX8qt05Lf3wZGwNrzqn/5FCOauqAHkF ldyBHxI0QbMNkLatdSt39Pnm+YZusD9/cBYIMK3L1FT55klABkAy+Ubcp/36ZZKUvL+2yl AGsoKUkvJQ90k9Whu0gKNJ50qknavQNnhkrvWrKxliocui0SnZlwIjTztDT0jCrYyahzBb w8l7Aq+cHuEdT784a8fx9a/OZUKgseDiHXjjRNAtiQr1gr4tyYmkGearQCf1rg== 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=190c4c2499e64e1c88f25f68c2929d110d635300 commit 190c4c2499e64e1c88f25f68c2929d110d635300 Author: Tom Jones AuthorDate: 2022-08-02 13:33:17 +0000 Commit: Tom Jones CommitDate: 2022-08-02 13:38:11 +0000 diff3: Use ranges for new and old diffedits in ed scripts This should make the output logic easier to read. No functional change intended. Sponsored by: Klara, Inc. --- usr.bin/diff3/diff3.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/usr.bin/diff3/diff3.c b/usr.bin/diff3/diff3.c index fa0aeb11d008..d52678846fae 100644 --- a/usr.bin/diff3/diff3.c +++ b/usr.bin/diff3/diff3.c @@ -593,22 +593,26 @@ static void edscript(int n) { bool delete; + struct range *new, *old; for (; n > 0; n--) { - delete = (de[n].new.from == de[n].new.to); + new = &de[n].new; + old = &de[n].old; + + delete = (new->from == new->to); if (!oflag || !overlap[n]) { - prange(&de[n].old, delete); + prange(old, delete); } else { - printf("%da\n", de[n].old.to - 1); + printf("%da\n", old->to - 1); printf("%s\n", divider); } - printrange(fp[2], &de[n].new); + printrange(fp[2], new); if (!oflag || !overlap[n]) { if (!delete) printf(".\n"); } else { printf("%s %s\n.\n", newmark, f3mark); - printf("%da\n%s %s\n.\n", de[n].old.from - 1, + printf("%da\n%s %s\n.\n", old->from - 1, oldmark, f1mark); } }