From nobody Wed Oct 19 08:01:37 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 4MsjqP2XpVz4gDTV; Wed, 19 Oct 2022 08:01:37 +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 4MsjqP1Pxbz40WF; Wed, 19 Oct 2022 08:01:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666166497; 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=UXRxwEkxAnZyKF0VTCpduxQCoINxF0fskEzkt4gRHv4=; b=fjDHnN+R8H+vbJffDJgZOmVZPtZrSVDzWl7K8HOnw9LGJ6swzcwyKjA/8osg/DtYD1xuFG enNahJiZ8yJkD/MuJWxM/jyZHSC9JjUBuNwRVXVB14LMoKkbkCLLZF8XfHmje/5xISsNyd pATYAfu5wHWIlHHyjSGVdLGy5OiMxPZdSAeed2/Af1R1a3obhXfGqbaB5U4Qf8Y3ww/d1+ nCbTEDv+yeIyeoyF+ygP0mPRjunMCKP7FlI6V+a0LpvXzexDokg/zCK8Wx/FF3yZzhr/RM ahZZetFrHPot0TpUdHc3OyGC0Nc9u2NHcqvfC51gAjCLtmXZ9uHvfAydrut0uQ== 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 4MsjqP0WbDzSTR; Wed, 19 Oct 2022 08:01:37 +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 29J81bsn061422; Wed, 19 Oct 2022 08:01:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29J81bSF061421; Wed, 19 Oct 2022 08:01:37 GMT (envelope-from git) Date: Wed, 19 Oct 2022 08:01:37 GMT Message-Id: <202210190801.29J81bSF061421@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 0821423134b5 - stable/13 - sort: deindent closefile 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: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 0821423134b54ea490882640e956a65e29cf124e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666166497; 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=UXRxwEkxAnZyKF0VTCpduxQCoINxF0fskEzkt4gRHv4=; b=cpNZzipiRJWYf1MOQqqsv9GCvt8/aJWSm+8yf8XQ4s7RJgj1/VIX/iulJieQ2hiTEXWLi4 GAMyZ16xJlw80LdG86Y57o4PXEHFrMHlJKGhUViwxhTtlbXu4gN6PdJhzpfKMwFC1IZBHp zt3W7IhIWU/oZpzi4sikVH7GoUT6X30tByRgnIAK9LAU+ToJ/ubJVHo0Fz/sv1oPKzQwwJ RFnOuQ26cFvS+v7sMN/CfPHdpWk/SGkIvz3kciqg1SLOnLAexJnDftg5ySK2My/7Z3zKqZ gpsy8OZU0gRhNumnKxdDnNPz4FIKRAE4Yfx/zGfBxgTc1NdtjChj1E2YEDHMaA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1666166497; a=rsa-sha256; cv=none; b=UXV8s3QEq1LlQDlhThOIWCqTDNjCNCfbUnUcOC5u5sWGarvP7zpxfF3jIdbOefX9wVdhTk eeBULAfbO2vQl7DytRo/q7F96Q6UY4NCSuy91cDh6/nV5sbiWgaDTYy1lGMnuqOiwIxotO BL0mdQuLv5fTUEy77BwkrmlMnfSde5R/lLK7rG93hrhg1Zuk+xUrvibdzmIH1dqFKrevFy 0yjvF+mIi0sqR1MjzoP/8e5PVyE4CgQDIWqznywhLN8rFgBLMUDCrZfkehqdMSMjIPfkrF zT7Fl9UqsFg4IL91QJrQ99G4yRAJ/wUGOd0OlniRUZ8VcyJ14ZyiSXjCzIneiA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=0821423134b54ea490882640e956a65e29cf124e commit 0821423134b54ea490882640e956a65e29cf124e Author: Baptiste Daroussin AuthorDate: 2022-10-13 08:38:12 +0000 Commit: Baptiste Daroussin CommitDate: 2022-10-19 07:59:30 +0000 sort: deindent closefile (cherry picked from commit f9d9a7cc4f2ff38795e5056721297e2b8442bf7a) --- usr.bin/sort/file.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/usr.bin/sort/file.c b/usr.bin/sort/file.c index 05058a2509b5..8f9d8ac89b5b 100644 --- a/usr.bin/sort/file.c +++ b/usr.bin/sort/file.c @@ -574,19 +574,17 @@ openfile(const char *fn, const char *mode) void closefile(FILE *f, const char *fn) { - if (f == NULL) { - ; - } else if (f == stdin) { - ; - } else if (f == stdout) { + if (f == NULL || f = stdin) + return; + if (f == stdout) { fflush(f); - } else { - if (file_is_tmp(fn) && compress_program != NULL) { - if(pclose(f)<0) - err(2,NULL); - } else - fclose(f); + return; } + if (file_is_tmp(fn) && compress_program != NULL) { + if(pclose(f)<0) + err(2,NULL); + } else + fclose(f); } /*