From nobody Fri May 03 15:03:53 2024 X-Original-To: dev-commits-src-main@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 4VWDbG1X3Pz5K9Kq; Fri, 3 May 2024 15:03:54 +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 4VWDbG0CX0z50Gf; Fri, 3 May 2024 15:03:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714748634; 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=fVPh2vC5eM3elwYz6qOjkBWqj0kCnbFbdbJ76hk23Hw=; b=cZNd6860HCRdsOEjaS5jY7NRlRvj1HwVvCU5Jr8JwZymkdcqlUEwLOc1E87uNgJOkfTp/5 8Ngg2zdb2eAeJDX5IBHtYkZrkGNgwCovlMSJGG0bSZsROVVVC7TELvTJ/AghGQS/JaH0ee lXYm7Ynrk307QnABjJn3/49yzLTHA67i49HsNA5PdcaUIdRvEyi4eBuq570XDFhnsN22pt J1OBclP4qa27efcr8tQlCycvcBU8e46cgCBnZg4QaJJX1EcBO5wbul8JbdbirxXYITuGvv j8DAyA0pZwHyuhVgh1D/qkZUMvmhRRuhZ7nMz3QOiUICcyAK4qBGTpc9/w6l5A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714748634; a=rsa-sha256; cv=none; b=snEJnpTMXFtWcGpN3OPIBZ+PYLzNdRY6zcrSs1zxctuo42vejta/iBp+3yAXnvHfPWiEoJ ZpS0sSD30KR8qbiWdJ7CSWApIMY5dhhsba6OUB4uf/j1+oQA7eTHgUN3hW9WlDZ+Vj7ttI oStkmagwIjFN+3/VKud8AOKLmWk7EP+NkhTiuzlkZjcWpTVbXhvqtdgho/Qu7E2aj8tNSv V3QotfmwARjXbpdpiXrR6p282CoDTtfcqtmVUt7suE8ts21jbCj6qvRr9v1FWk7MAUmsnH UUM4UNYXgwXC1zkJBFdFqZhheTDDTzEVJvEh+sofT2BeWeoKYMq6YEbhA6EkoQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714748634; 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=fVPh2vC5eM3elwYz6qOjkBWqj0kCnbFbdbJ76hk23Hw=; b=fbuqVliB4LLWA2vun2xij4zJetV3YHLeAub2TmgJGTLXNH3pNTciz+rDaiMxEzcRIyHq+u NntpJQjrmm8gJAvZKqfFFmihstQCOuY4/BJACRadApYkt07aJutNKdXD8MSc9urrg9rd4J zHM8O+D8jHiZn+SLlsnLWo250Vje2C5uXUKYuxbd/DVbY0uKvgb6SL72btIg+H5QnXWKpc VUE9KjJyscOEj+1BZtkCC2l6yDD/I5AmDptDMEGjrU+ky7u4RExsbQm5DcZe0bFA/9/Kpc 06seW7Qu/AitBmmi5JjN+b1vD7jIpmGNancyd/WRkCiNjbzkwfkBhJ5OdKWbpA== 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 4VWDbF6xXBzrFD; Fri, 3 May 2024 15:03:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 443F3rFb086154; Fri, 3 May 2024 15:03:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 443F3rGx086151; Fri, 3 May 2024 15:03:53 GMT (envelope-from git) Date: Fri, 3 May 2024 15:03:53 GMT Message-Id: <202405031503.443F3rGx086151@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: eea5f8d40860 - main - diff: Sort headers. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: eea5f8d408604c2f70e068f7806a226fe01fc559 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=eea5f8d408604c2f70e068f7806a226fe01fc559 commit eea5f8d408604c2f70e068f7806a226fe01fc559 Author: Dag-Erling Smørgrav AuthorDate: 2024-05-03 15:03:06 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-05-03 15:03:50 +0000 diff: Sort headers. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D45078 --- usr.bin/diff/diff.c | 4 ++-- usr.bin/diff/diffdir.c | 2 +- usr.bin/diff/diffreg_new.c | 10 +++++++--- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/usr.bin/diff/diff.c b/usr.bin/diff/diff.c index 67aab0de91b5..c3fe255a294d 100644 --- a/usr.bin/diff/diff.c +++ b/usr.bin/diff/diff.c @@ -26,11 +26,11 @@ #include #include #include -#include +#include #include +#include #include #include -#include #include "diff.h" #include "xmalloc.h" diff --git a/usr.bin/diff/diffdir.c b/usr.bin/diff/diffdir.c index 539f537a08c3..8d12e868f90e 100644 --- a/usr.bin/diff/diffdir.c +++ b/usr.bin/diff/diffdir.c @@ -26,10 +26,10 @@ #include #include #include +#include #include #include #include -#include #include #include "diff.h" diff --git a/usr.bin/diff/diffreg_new.c b/usr.bin/diff/diffreg_new.c index 39b359422f39..3b50dfd5940b 100644 --- a/usr.bin/diff/diffreg_new.c +++ b/usr.bin/diff/diffreg_new.c @@ -15,20 +15,22 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#include #include +#ifndef DIFF_NO_MMAP #include +#endif #include -#include #include #include #include +#include #include #include #include -#include -#include #include +#include #include #include "diff.h" @@ -266,10 +268,12 @@ done: diff_result_free(result); diff_data_free(&left); diff_data_free(&right); +#ifndef DIFF_NO_MMAP if (str1) munmap(str1, st1.st_size); if (str2) munmap(str2, st2.st_size); +#endif fclose(f1); fclose(f2);