From nobody Thu Oct 13 08:42:55 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 4Mp31q4q5Jz4fS17; Thu, 13 Oct 2022 08:42:55 +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 4Mp31q3xBcz3ty8; Thu, 13 Oct 2022 08:42:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665650575; 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=XayLO4T7KCqQKzdGS4NFh244cKwolwkxwxlKcJuY+U0=; b=Zc0Tx4P6bQktGMl1Q+Xcyt1qFzp6weIUH7mHrLjbA9UPmvU4z7pSS9vjassgssBGnKlWUD T5C+KoadwgVgsRkVVZimshZOP9fTRfIvljVUgkXlEtHG4pic2qF39myG6uUzux+5jMpwNv KJCopRYOxI0HdNSx82GvWpZ+hLQtlDEXsAwvCPxcZadAJHXVBWa8Unw8+NZ6m9T3V3qODC TELtJRphuRNMUyEDPV3zhvi8vekbxJbnFQ85+CNndbHZnNuwGx2MJZi8uSWU48Gn2EFwPO wnzikbcMpmkAPUl8KB/hm0RpwnNwzuHoCaPj40cBsM6yoTotRkql6BpL+QO7SQ== 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 4Mp31q31DdzMVn; Thu, 13 Oct 2022 08:42:55 +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 29D8gtQi001260; Thu, 13 Oct 2022 08:42:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29D8gt6k001259; Thu, 13 Oct 2022 08:42:55 GMT (envelope-from git) Date: Thu, 13 Oct 2022 08:42:55 GMT Message-Id: <202210130842.29D8gt6k001259@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: f9d9a7cc4f2f - main - 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/main X-Git-Reftype: branch X-Git-Commit: f9d9a7cc4f2ff38795e5056721297e2b8442bf7a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665650575; 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=XayLO4T7KCqQKzdGS4NFh244cKwolwkxwxlKcJuY+U0=; b=qc1e7AJeSlX7+o5g66gZjyOAn0d31bpHQcoa7pB/RA9oE8c5YIp2ZW/vyRj9MUpX3TgSlV esffdB7hYy7JrfbVUjbOWIe+T8XtPVcuu/gSAH3Pu1nsz+7CJuZQU5YGm7vULEGRZjjljW Tweye0TXqq/UY56elbacjEWChoKoxd5o0niBdz7L+V1L+2KfPW1O7Jw2WPoe4fllZm2/Uw p82q9WqS0Nd1LY6xTA+1ffJ26ynUghKB28Yv/dW4K520Bzc/wWi+fHeqVcyW9p4uKGPx7Z zM90HSiKlj4JQboTe04A/6iPVT8BzxNtIjnm+WkRlZ2AsGnwAP9PuMpsRolwtQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1665650575; a=rsa-sha256; cv=none; b=ttTeujHSALUpTg4PibZlYCxBk6I4aew6Hs/4KJGyrgbnDCAH0S3hCLUZ54Sme/Scnd4LQt miJ8/K6+QfE0sk1xueIZSeNhavobtx/bg5ZwS18BQEpZO6ib6cs1pKZQQqajWDDqhVCtf/ C9pHD5Iq8lPqkfd4j5E+efNBRc21IqilUxREfr96IacFFcEuggMcdQnx3LcAyPBCqGyCj7 27Mt+CJWDKIG7qbq99pZeS0jwOjXwFGQtGh+4HTqQhwxFsvR8xlfz5E5eAjf+o9pcj1cpH EQpdNUqnOEwwNGo0r01SHfspIZJgUyD7Cra8WVxAXA99sa1JdBVX53iA4NFMqA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=f9d9a7cc4f2ff38795e5056721297e2b8442bf7a commit f9d9a7cc4f2ff38795e5056721297e2b8442bf7a Author: Baptiste Daroussin AuthorDate: 2022-10-13 08:38:12 +0000 Commit: Baptiste Daroussin CommitDate: 2022-10-13 08:38:12 +0000 sort: deindent closefile --- 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); } /*