From nobody Sat Mar 12 18:19:29 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 A2A451A031C7; Sat, 12 Mar 2022 18:19:29 +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 4KGB0K3yPtz4qDY; Sat, 12 Mar 2022 18:19:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647109169; 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=FwSSJNudVaG3JeNlQIkcDOV8zhP1JuZmAWEdaImK0Z0=; b=xkHBcknIQA1XT6lPLNlbQj6E9TE7LxYavTq3UMxk6cRpzbxVX17PWcIQW7unjQoDV+GolY i70mDBoWAu5PIEOMGisrBjyLj08hbmuuCmSr38QgHJjpaLMuDo69eCCWD9ZVMQg0qY+YPh jSZs5IHyeEWf5bfDxlg0SLdBKRAVSO8K3EIDDuyvsg7lj/7AV22Qypay4H5dsV2IPUrDQz 1mBeIhnLmehjfwEsKpTGdKn3tSlvcKq937U1x3j4Ph6bSVSGLqK0SSLsYRutfpWMbbRmoL A2nPQR6XHqvm+BHJcNXQKbxfkfWk+JQqHkoLYyLjWeewU/vIdndj+c6bwR7Uqw== 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 695411AEC; Sat, 12 Mar 2022 18:19:29 +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 22CIJTUa063497; Sat, 12 Mar 2022 18:19:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22CIJTmV063496; Sat, 12 Mar 2022 18:19:29 GMT (envelope-from git) Date: Sat, 12 Mar 2022 18:19:29 GMT Message-Id: <202203121819.22CIJTmV063496@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 9dc5a4c9fbff - stable/12 - Fix indentation in usr.bin/diff/pr.c 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: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 9dc5a4c9fbff93a2496181aa22e253faee2f4eac Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647109169; 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=FwSSJNudVaG3JeNlQIkcDOV8zhP1JuZmAWEdaImK0Z0=; b=T/EQhS30cpMPmRMfyG6/HRGZ/tFKp6wB+d3z4W8ouwoP2gGDG6UTjsixg5l0W69GK4EUcd HqTG9SZQLKPUCKaDrUj0FxkbgN+qkfPRXovbbQkybocV7sQ+bNjtTem6xMxbF/3b4XYIPc e9kvUZm6f/UPId1g29kF1hvTEdqgKpTmGEY7TbaxEdpIW1/0GGPyP46lZqGk1t8hgStlbl ntsZP0DUbteinChcbYdbcRLtp/LEqZ95L2zcyZRNkEFDIjpEcUedmeWqL4n9V4NyA+0X+/ ZnX4fhrm6xwKwltyyWFgmBX2fY+ofx4HwwH1VbE9DnX2vnx4Im2R5on/HctgNQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1647109169; a=rsa-sha256; cv=none; b=sePVg3xXqx1HcG9luVc8+/R2/Mx5F87VBfrf1Dd0Rsoh1RKablnJ2tpzjRqctUCvxsgi3+ G7WJqQxnhgB5C1arCn2X9Mn/C+fM4ZlxQz3B3XZ7prE1CmZsHgCM1p3gv3jGXSuIe5xhJ/ avnLn2oafUHyHDCKbFstZdBjNbARvkmBq6R1w6QrtNLp8NL2cDrs1DoNGbyfxdDsRSUtcY HKcs2Aay90K2qPQmtD0c4x1VEpDmk+rsNYZG5+tC8UvVlBz5/kMWseimaChrSaHXuX3NDu zAFggZHiGickz9fqsxA/w4tWjgaKsDhDs/AKuSjKuVJyRF/YJLNCBOcFKl4sOQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=9dc5a4c9fbff93a2496181aa22e253faee2f4eac commit 9dc5a4c9fbff93a2496181aa22e253faee2f4eac Author: Dimitry Andric AuthorDate: 2022-02-28 20:06:19 +0000 Commit: Dimitry Andric CommitDate: 2022-03-12 18:18:37 +0000 Fix indentation in usr.bin/diff/pr.c In commit 6fa5bf0832ef the pr(1) related code in diff was moved around, but some part of the indentation was messed up, and one line was duplicated. Remove the duplicated line, and fix up the indentation. Reviewed by: bapt MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D34398 (cherry picked from commit f7d6e97e4bf1fe4c70d5b0ef9fdf649bf07e1c91) --- usr.bin/diff/pr.c | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/usr.bin/diff/pr.c b/usr.bin/diff/pr.c index b03df9afc028..4c7108cd7451 100644 --- a/usr.bin/diff/pr.c +++ b/usr.bin/diff/pr.c @@ -81,19 +81,18 @@ start_pr(char *file1, char *file2) pr->ostdout = dup(STDOUT_FILENO); dup2(pfd[1], STDOUT_FILENO); close(pfd[1]); - close(pfd[1]); - } - close(pfd[0]); - rewind(stdout); - free(header); - pr->kq = kqueue(); - if (pr->kq == -1) - err(2, "kqueue"); - pr->e = xmalloc(sizeof(struct kevent)); - EV_SET(pr->e, pr_pd, EVFILT_PROCDESC, EV_ADD, NOTE_EXIT, 0, - NULL); - if (kevent(pr->kq, pr->e, 1, NULL, 0, NULL) == -1) - err(2, "kevent"); + } + close(pfd[0]); + rewind(stdout); + free(header); + pr->kq = kqueue(); + if (pr->kq == -1) + err(2, "kqueue"); + pr->e = xmalloc(sizeof(struct kevent)); + EV_SET(pr->e, pr_pd, EVFILT_PROCDESC, EV_ADD, NOTE_EXIT, 0, + NULL); + if (kevent(pr->kq, pr->e, 1, NULL, 0, NULL) == -1) + err(2, "kevent"); } return (pr); }