From nobody Wed Dec 14 01:33:31 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 4NWyYm2K2Dz4kNRL; Wed, 14 Dec 2022 01:33:32 +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 4NWyYm1dRXz49FP; Wed, 14 Dec 2022 01:33:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670981612; 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=gSg6qRBgi5JJn9rqfIxQz/4LYWN6m2JkA+MTKcHdNSQ=; b=d/633FE6NPlbWet1pcwlikRfOIl1hAUioAL4OX6gEoMgi7wf8//jDrM2d473kumcBc2E/y +9Fy2MmHkPUcbUjaToPudIozgnJZnUovJuaxhlhKZzq9rJyBh/9ibT8pnu30XbslfsMZcL 9l0kObFgkA5A+M+GulAzLWafqyrRIzij3d0gqfvSJoKdRvtbuKS7JiBGeNYExybhQO9drg 5bydAC1lcXNDFdrQDlT9xTAsL0mInorNXdBhi1eR+/JDjDGfuj5x+ob6HpbtyUM15D+fBb GrxI8dCEFxR2Dnp67/sj+nEBVh2GbeURWKEeJ/TPQFJR4GvmVW2dxVFtYGdHlA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670981612; 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=gSg6qRBgi5JJn9rqfIxQz/4LYWN6m2JkA+MTKcHdNSQ=; b=AYKttes0vRTRM8sT+NXH6HwmQcLIbpHORwUr+jDlI/aQtbXIv/uZYsBWxit3sY3zvU6N3H 3vq8hAZMUhsECy3JRaUuRrSUNKce5C9KYDiANENZnq6jeVXmrwslxdNUKm9NrW+jlv3PjL 0YRU853c1yN2wXwrZjBn7yKjOG7l7dZSvp46cY2HiUw8PV4JP3QMeKyFpbm11WZbd+M5Lq Lzx/9egzk3jrswo20i99zM+dYzDPxdx2jxAgBd7jc+3K9k88JPx7V/wfeHgFWwVg9U+c+C QwxDrSS5J6NwHiCJdLg/74MHuScWMk5PEV4J/mThOMAzyNjX6fqvibwWw9vt5w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1670981612; a=rsa-sha256; cv=none; b=H+ccNyZ9YY4q7oE5b1nAvDPJgxoMTN/FV916ya+NYiLDyGe2rxXzETy/eCn/3CuYVEHuWU PX9iFYFVhiocvLSrwLGYHhTx/clDlxwuwz3YCsTrZy4DTGwvhZ3IPk+UOO4QrVrFZfrL7e nWw6pUtNTR0dh6Jd/U7IPWL1BTyu3/bed9TfMsFtAPMfLmQ/2l5Bui0txoDHzviPEbktrP C+wNeaJUfHlqRmEx2urdXxLJceUUrSFlB58/a99nFV+M6ssvzIYG9jQVm29zbY1omoELIC kfR8Zcj0GtDfsq6htWKBwXvcwiz68VSxxtDbckFyFEQ1o8bH+WtkGDInjDEdTw== 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 4NWyYm0dr7zbRj; Wed, 14 Dec 2022 01:33:32 +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 2BE1XVhZ077152; Wed, 14 Dec 2022 01:33:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BE1XVde077151; Wed, 14 Dec 2022 01:33:31 GMT (envelope-from git) Date: Wed, 14 Dec 2022 01:33:31 GMT Message-Id: <202212140133.2BE1XVde077151@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 54d65fdd5643 - main - diff: restyle loop a bit 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: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 54d65fdd5643f61a816c1d028b53039290ed1d92 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=54d65fdd5643f61a816c1d028b53039290ed1d92 commit 54d65fdd5643f61a816c1d028b53039290ed1d92 Author: Kyle Evans AuthorDate: 2022-12-14 01:31:21 +0000 Commit: Kyle Evans CommitDate: 2022-12-14 01:31:21 +0000 diff: restyle loop a bit This is a bit more readable, and this loop is probably unlikely to gain any `continue` or `break`s. Suggested by: pstef Differential Revision: https://reviews.freebsd.org/D37676 --- usr.bin/diff/diffreg.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/usr.bin/diff/diffreg.c b/usr.bin/diff/diffreg.c index 1247317951d3..971f640fa05f 100644 --- a/usr.bin/diff/diffreg.c +++ b/usr.bin/diff/diffreg.c @@ -1246,9 +1246,9 @@ fetch(long *f, int a, int b, FILE *lb, int ch, int oldfile, int flags) else if (diff_format != D_UNIFIED) printf(" "); } - col = 0; - for (j = 0, lastc = '\0'; j < nc && (hw == 0 || col < hw); - j++, lastc = c) { + col = j = 0; + lastc = '\0'; + while (j < nc && (hw == 0 || col < hw)) { c = getc(lb); if (flags & D_STRIPCR && c == '\r') { if ((c = getc(lb)) == '\n') @@ -1313,6 +1313,9 @@ fetch(long *f, int a, int b, FILE *lb, int ch, int oldfile, int flags) col++; } } + + j++; + lastc = c; } } if (color && diff_format == D_SIDEBYSIDE)