From nobody Mon Aug 24 13:00:16 2026 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 4hT9xf3h1fz6pMpN for ; Mon, 24 Aug 2026 13:00:22 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hT9xf2qTzz3SQd for ; Mon, 24 Aug 2026 13:00:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1787576422; 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=tDX4rJXirxSPS5mxnm/+/DMBLylgl1JgASpQb09Fo98=; b=oBCpo6+7HaQZW9sPMLbNmY6XSsqkNPOB5LfhZOIbbET5jzPEOd2z8tDHwIEd3rK38Svgbz zVJTvAeb0uae/FGEDI+r/j6f+faV20Ys36crbyzeBzlxRZWdjgZged4AIpl0sfQML6VUNp ncOKSKTu/ZAYPsAgG3O2Z3G4cs20Q/wI1+foTi/WhqnYWbLwUrKGEjVM0gf1zW7scU79Fx qYWrMPdsON83kzutZCCfam3lQQuknWH3LyjcoX5+lj/Lqlf6yOXMRSzrOhSgEffBliIuZG DQ/GLCn8RB5lAg2pJHxerlXz39ItUbhEUTjNClVpeX0XfpfPxEhQw5Ktw21ZVg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1787576422; a=rsa-sha256; cv=none; b=GB5ACjUtCjhdmTDHH0wU8ot4m9Kl97DOEu6AHPChZ7tHIxjH2A3rZ3W4Wvd9ukNH7hfaG5 Tzi9IYqqV1W0wRQij++rvxhOAkP9NRY8EOVSnsSnPzubL3AywKGohD1qxLhzCM/7jCGvVc cOUuvxH3Oo7mxOMFWDnptUFQaI9Zgnuzvk7x86wn3jAXe37EAhLWpDI/zdtXxu3+8HWBI0 i2kl+7CnkIQxck3Em1X/FxpJwt0CoeIeUJ1VLbDy6uIfaKmPFJx/uUZj3XawhyA46zJdGn IojzfHvoppWznot0ywQF+ae4pg2Y3ArL6YME52somw02/UqnBifI2XBmzE7Tzg== 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=1787576422; 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=tDX4rJXirxSPS5mxnm/+/DMBLylgl1JgASpQb09Fo98=; b=NOQm+1LzaLJFP+YuVbhfaMm0oXgBZQBpOXbIRDVn7xxvZ1rkFwY1TqyOV0GZSSy9wxWbXO LlPpbd+jzcCImFpmcIRTDsB3CX4DVrO3IgTtJr+iITSOm3+TYD91Z2iKTOqRtiLvOVIJCG SwufPxSJjaR6YTXx3ZuXFPGtaptDzis/+6PVui0MSQ4kTqIyro8TrnYOTEg5pyMxmcxw1V PM5Uyxotlwbm1KbKMwrRruHCUW3g832VYCqUWnYiEcfJI/FcIR4/ddsEk5Z+z1TGMG16pe dIyefDNGgDOqqOv/vaHkVgBr5hdH4mAWxXBpv+F+m8F1ocqID/Sa+YHhWuF9NA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hT9xf0RJtz155S for ; Mon, 24 Aug 2026 13:00:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3b7bd by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 24 Aug 2026 13:00:16 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Martin Matuska Subject: git: 47f89e7907e2 - stable/14 - libarchive: rename macro ALIGN in test_write_format_pax_align.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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 47f89e7907e2ef0b308b033c102bc31fcff5cb73 Auto-Submitted: auto-generated Date: Mon, 24 Aug 2026 13:00:16 +0000 Message-Id: <6a8c4060.3b7bd.579471d3@gitrepo.freebsd.org> The branch stable/14 has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=47f89e7907e2ef0b308b033c102bc31fcff5cb73 commit 47f89e7907e2ef0b308b033c102bc31fcff5cb73 Author: Martin Matuska AuthorDate: 2026-08-24 12:58:13 +0000 Commit: Martin Matuska CommitDate: 2026-08-24 12:59:31 +0000 libarchive: rename macro ALIGN in test_write_format_pax_align.c This is a direct commit to stable/14 --- .../libarchive/libarchive/test/test_write_format_pax_align.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/contrib/libarchive/libarchive/test/test_write_format_pax_align.c b/contrib/libarchive/libarchive/test/test_write_format_pax_align.c index 0ca0c81062a4..83edd8b341f4 100644 --- a/contrib/libarchive/libarchive/test/test_write_format_pax_align.c +++ b/contrib/libarchive/libarchive/test/test_write_format_pax_align.c @@ -29,7 +29,7 @@ * an alignment boundary in the archive stream, so it can be reflinked out. */ -#define ALIGN 4096 +#define PAX_ALIGN 4096 struct file { const char *name; @@ -46,7 +46,7 @@ static const struct file files[] = { { "small", 100, 'a', 0 }, { "big1", 5000, 'b', 0 }, { "adir/", 0, 0, 0 }, - { "big2", ALIGN, 'c', 0 }, + { "big2", PAX_ALIGN, 'c', 0 }, { "tiny", 1, 'd', 0 }, { "big3", 100000, 'e', 0 }, { "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" @@ -197,11 +197,11 @@ verify_archive(const char *buff, size_t used, int gzip) * reflink would read from an uncompressed archive. */ off = archive_filter_bytes(a, 0); - if (archive_entry_filetype(ae) == AE_IFREG && size >= ALIGN) { + if (archive_entry_filetype(ae) == AE_IFREG && size >= PAX_ALIGN) { failure("data for '%s' (size %jd) must start on a " "%d-byte boundary but starts at %jd", - f->name, (intmax_t)size, ALIGN, (intmax_t)off); - assertEqualInt(0, (int)(off % ALIGN)); + f->name, (intmax_t)size, PAX_ALIGN, (intmax_t)off); + assertEqualInt(0, (int)(off % PAX_ALIGN)); } /* Data must still round-trip intact through the padding. */ if (size > 0) {