From nobody Sat Mar 12 18:19:09 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 12A481A03179; Sat, 12 Mar 2022 18:19: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 4KG9zx74YMz4ptk; Sat, 12 Mar 2022 18:19:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647109150; 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=EPSpGPQFJPR480qE5yAgk5A9jpo7W+DAG2mZJCSa+wo=; b=QAV6yKCQEx7P22qbgsOKsMHXuuAdGgSUAVMPhg9EqKXexWRliPhBBoi37VAg2nJwvnRvZa muST7cLC9cd8TudC4LZqMjmd1aElUW8kXBvuR9907Fx0c/eli3xQKTHMZuBGkIxU7VgORl QmcBsKLfKycoxktCilLmeGcIDbwusuEFeitYW2Nv6Hue2wMkqNw5qd+O8ngV7mnACDuaXq BKteZDqr4wZVmyYTZZXh9B6w+bJytILoUJ1iWSLEzo80C+Aje+u5CSLiplA/znE2DZXVmY vuXl0xW58mmJwac5FTHESyrLqfH7smCJIJFTWWASzXd7aXURW2hHNFZ7Sf7xHQ== 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 CF0DA193F; Sat, 12 Mar 2022 18:19:09 +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 22CIJ9ZZ063362; Sat, 12 Mar 2022 18:19:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22CIJ9tn063361; Sat, 12 Mar 2022 18:19:09 GMT (envelope-from git) Date: Sat, 12 Mar 2022 18:19:09 GMT Message-Id: <202203121819.22CIJ9tn063361@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: 5e5c14493cba - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: 5e5c14493cba62d7c38c0be7650387a493f61b44 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647109150; 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=EPSpGPQFJPR480qE5yAgk5A9jpo7W+DAG2mZJCSa+wo=; b=KwciGpM+nc3gStZP5xLikkRZyaZBu/9TdWhTE3ILLq/LHysYytjHMD3UzwoaW2LPkw8IKD Z1HifFuPIaXpuDz/8rL/DSWyVzriauDDWXJ/KNH7CgSodRo5vkPFxBvUEHSQkpbbPkefpK BzU9B/+46KHsIzj1cgPPH/vlhVuWIwP5FFfQfO+RH/sxmY56mTBZ8u34u1P0HxjdMCJ0eG +6JQ4R6R17hVokOJDOMUPfSPCOeASBVlFg1cyUIn84kkCAt9TMwpbdzOdLEETQRSfkgbcJ E5miTvEfA7KdtrjtB8cKuEvDwxEF4YFApeHDh9BAYu1qaH01vhxje+KbH8231A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1647109150; a=rsa-sha256; cv=none; b=iSX/FPvlrN/mfhrw3/BSRjPluDysfu0fj8bEHZJN8fNV7ZWNBNRfIe0xdpEx/mM3LGV+Wj n2iOj03gvssRDQCsa/94SqRG6go3ik9kSUeVUWWRf4cRgGf6xwxyHvBneSxSSOTNj6+fE6 hkffk2+DqxxZjbQPMn/Z/+aIUVLQad59NF+YoxOJu6V5XY208BplZV3Fjnou3esH5OjlUT hm68ypyEjQwt0BtZjyzXbGsGgm1mbAJ5j9yPjXrK9YP9Wj2Uhfu+zZZ7C+/ViGA6Lf0A7g V/yHX98gXi9uk9RQEmgBBhtRZ4ficdjM5d49F7y1RuCOqrmTGY4g5BFvtCuCfg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=5e5c14493cba62d7c38c0be7650387a493f61b44 commit 5e5c14493cba62d7c38c0be7650387a493f61b44 Author: Dimitry Andric AuthorDate: 2022-02-28 20:06:19 +0000 Commit: Dimitry Andric CommitDate: 2022-03-12 18:18:32 +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); }