From nobody Wed Oct 19 08:01:38 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 4MsjqQ34qgz4gDRq; Wed, 19 Oct 2022 08:01:38 +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 4MsjqQ2PdXz40Qf; Wed, 19 Oct 2022 08:01:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666166498; 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=81VAMP6iTAbcUU0gIAd4h81PlSC4+CXEgOpUaWjmePQ=; b=DvAXkMYU5wzqkQTncVnRxBRbOwSne1Tce9O4gRpUtMff9dbb5/52d9GZ9lJIcqWDF+AfU3 1BQKaatqw6mPP9lF2fZ3wDrCMOo9ur61f8WG0C5AtB150pP1gcEcU75oNgqYlpCerm4f+9 nlkSOqIecPbeSCwI/6rgZWxFQLXHTA6bsklYVxGol8nqYGMVicO2hc0vp9lwc0FcGc8vuY l8RB/6S5qwPhq6eMo3AchlkJIQ61pAoebL527Rf6QxKvEyrng/vjwJJm0kdw3Wp2IgZji2 Hlq85UlWebUnSyNdXY+Ky8n4+HKCqVreE1AhPerKozz3J8O1x1jyjz9Jb56gyA== 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 4MsjqQ1X5CzSVs; Wed, 19 Oct 2022 08:01:38 +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 29J81cEa061452; Wed, 19 Oct 2022 08:01:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29J81cCO061451; Wed, 19 Oct 2022 08:01:38 GMT (envelope-from git) Date: Wed, 19 Oct 2022 08:01:38 GMT Message-Id: <202210190801.29J81cCO061451@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: 1cdb98e72558 - stable/13 - sort: simplify file_reader_clean 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: 1cdb98e725586384105f73d13d58a8706b6e01f8 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666166498; 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=81VAMP6iTAbcUU0gIAd4h81PlSC4+CXEgOpUaWjmePQ=; b=qbmMBN9lXbJBumADXQ78gV5V3iT3Hl/j9CNlFqMQBDiWgd3yUh+MxvJrF+GRktrkLcTBt8 Mboo1v05d8lzZsAJ/FcX9VGXU5bS77qjxt5i9C0hHJUANVBw01Cobe4+fOJWsGe/xtycKc a78sozoj9CLx3ivnlUqlapc83vlNh/WgeLaWR0yucMe3zB4/8oNbrq0ZibK3Q2jv0vKQV4 RicCLSKng4QBcNmd/xMJnkaPwiqdJJslvpMpnKJONYcWiXDqWwm71pxRh32AXoq8PpBwBF es8jlcMi82Z3qjNMQ4Jo+johOvZdgaErTG7t2eJXeNhTFcKqFN/4jw+BvIQ38A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1666166498; a=rsa-sha256; cv=none; b=tK2eOBPShyz0oHJKrzF6UPwNGTFfXdhWbE9iW6voTJXT8A7fYjt5whwK8+v6Zs2ycyDThK EeTpOq260KBO+onBsnGKU5zCPEP0MM2t9Pz0IxY8iLs2qIj0tBmgtHos/VUknGrJwlUX82 JkTMGm1EBcgu7VkmhZn+TY3FZCBArfcuY4v8hG4ulnlwboGDsY3yZGfltsLnKPxbtD9NqH sUswFsWE/cbiikWY5+nS7H799utkHzOrM/Ouo3P4CKCUyY1gVkQ3tBtUfgqBMUSZ1I5/zR S7SsT5fDGxhEJeyWAtuHxGxSSGDBS1K0Ev+Dey9ZXAs8NIMRJKBPvQ1ijdYfzQ== 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=1cdb98e725586384105f73d13d58a8706b6e01f8 commit 1cdb98e725586384105f73d13d58a8706b6e01f8 Author: Baptiste Daroussin AuthorDate: 2022-10-13 08:40:21 +0000 Commit: Baptiste Daroussin CommitDate: 2022-10-19 07:59:31 +0000 sort: simplify file_reader_clean Deindent the function, remove useless tests: - free already test if argument is NULL - closefile already test if the input is stdin or null (cherry picked from commit ffd41d39c660ca1c80b77707238e8e5ef26d7d7a) --- usr.bin/sort/file.c | 29 +++++++++++------------------ 1 file changed, 11 insertions(+), 18 deletions(-) diff --git a/usr.bin/sort/file.c b/usr.bin/sort/file.c index 8f9d8ac89b5b..0f1a9e6bad4d 100644 --- a/usr.bin/sort/file.c +++ b/usr.bin/sort/file.c @@ -574,7 +574,7 @@ openfile(const char *fn, const char *mode) void closefile(FILE *f, const char *fn) { - if (f == NULL || f = stdin) + if (f == NULL || f == stdin) return; if (f == stdout) { fflush(f); @@ -699,25 +699,18 @@ static void file_reader_clean(struct file_reader *fr) { - if (fr) { - if (fr->mmapaddr) - munmap(fr->mmapaddr, fr->mmapsize); - - if (fr->fd) - close(fr->fd); - - if (fr->buffer) - sort_free(fr->buffer); - - if (fr->file) - if (fr->file != stdin) - closefile(fr->file, fr->fname); + if (fr == NULL) + return; - if(fr->fname) - sort_free(fr->fname); + if (fr->mmapaddr) + munmap(fr->mmapaddr, fr->mmapsize); + if (fr->fd) + close(fr->fd); - memset(fr, 0, sizeof(struct file_reader)); - } + free(fr->buffer); + closefile(fr->file, fr->fname); + free(fr->fname); + memset(fr, 0, sizeof(struct file_reader)); } void