From nobody Mon Dec 29 17:07:15 2025 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 4dg2hN1JJZz6M3Pl for ; Mon, 29 Dec 2025 17:07:16 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dg2hM5gJbz46y1 for ; Mon, 29 Dec 2025 17:07:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767028035; 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=5cTpxOBRPb3MDy7xwbKDIMnNGTp9YUURrtud6YpKfQA=; b=kDeXymSXCW/L4JtTFXJI0QcrmONR4G8UZReTVgA0dpkg//Sz29OOAdGNWC35HXnFr7GFd4 UwKsPx0IBU3o9JcwiOrYakiKym/a5TbqIqphqTWk41Crih/zgraf78p+7viRAWmFAX1gDY UCQZFqvM+WAdvwWtrKd53dfDg4UKgHbq1ma/p5NsnTFCtGfrglnXZzho/dEyAIN7p+P2Nk 5KKZGckVC4iuJoH/6mJMJtWXU+U0Wxugj3B1blLaysFXh6H8anreuQGtlodiUJJFU++Edg vV9k3FkZAyV+uPJ6BgA2m8X/L5hk+l0UwPvgWXSJ4etWMjm/SN0Vd69U7H/NiA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767028035; 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=5cTpxOBRPb3MDy7xwbKDIMnNGTp9YUURrtud6YpKfQA=; b=E8j/wkkfsbCOVkGFaC8YzkHJwvC+fFqe/utfT0k1fo8p48Za3PHvBD4RjyJeErKMk5EYeD YqGw3ed36mbxb9sJNu8RaU3sZApBgPiLCSxc71aykeK+6BIJQO0FEYG5iUJMtVYA3q7j/h 5xn9qkrgFyD7r1c4d2ju2NAIQ5gbXrK/ixHCuSO7+I0ad80C8+dUPncLdtYR5tmvaDcXpR V8C4nEYoSyVMHzSrS85xIunG0TED7FsUCq59AQRp22GMKUCcja6uTASh64Xl6n4P3cvtRm AXKo+MTD22qks3Znw+z+OWzhByn6CJNipSGCL0fnAfcBxiNr1EsVN02kKCB1MA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767028035; a=rsa-sha256; cv=none; b=nlVWsB9WRlwFWsOVHGYmWgJdACwrfC37IWZWHt+vV4nlDpRRMu9ZektdgcFjq9vQGmZAQY 2k8MbaDnN4Uy2dWBH9EIqLxEmIECRLkMvkH5ktHcNEcdwydag8Au6l8RdoVrkpgrHzUeFK rqicqQN0se+eNoH2gt0ZzN9XMkbX1124uYrODxhYP+PGau1Pk4edSCH2DnPSDRvN5b0xaF Q0m0GeeXM2slnBq8/HfZ+s8GJPMT1SB6TUnzhPMxajaF1lKkiW7Zdb2URpWolp79L9Wf6M 6EJWUFQRnGKw8i04oKeA1Vv7Gb25gOSUQ+NJk1mV4jbRniQXC2V5njfvSWHUSA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dg2hM5FCmz83H for ; Mon, 29 Dec 2025 17:07:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 26c23 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 17:07:15 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: eb92fbcadeec - stable/15 - telnet: Remove usage of ALIGN 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: eb92fbcadeecb677d90e3cac572b64b862545015 Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 17:07:15 +0000 Message-Id: <6952b543.26c23.461e27e7@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=eb92fbcadeecb677d90e3cac572b64b862545015 commit eb92fbcadeecb677d90e3cac572b64b862545015 Author: Mark Johnston AuthorDate: 2025-12-22 15:18:52 +0000 Commit: Mark Johnston CommitDate: 2025-12-29 14:31:40 +0000 telnet: Remove usage of ALIGN gcc doesn't like ALIGN() being applied to an array type. Just use __aligned instead. Reported by: Jenkins Reviewed by: brooks Fixes: 80203a27e964 ("Add sys/_align.h replacing machine/_align.h") MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D54290 (cherry picked from commit 3a4275a5f1f5dccd6918c4eff3b84488e322ad5d) --- contrib/telnet/telnet/commands.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/telnet/telnet/commands.c b/contrib/telnet/telnet/commands.c index ca3460e455ad..2005362b5326 100644 --- a/contrib/telnet/telnet/commands.c +++ b/contrib/telnet/telnet/commands.c @@ -2848,7 +2848,7 @@ cmdrc(char *m1, char *m2) static int sourceroute(struct addrinfo *ai, char *arg, unsigned char **cpp, int *lenp, int *protop, int *optp) { - static char buf[1024 + ALIGNBYTES]; /*XXX*/ + static char buf[1024] __aligned(sizeof(void *)); /*XXX*/ unsigned char *cp, *cp2, *lsrp, *ep; struct sockaddr_in *_sin; #ifdef INET6 @@ -2888,7 +2888,7 @@ sourceroute(struct addrinfo *ai, char *arg, unsigned char **cpp, int *lenp, int lsrp = *cpp; ep = lsrp + *lenp; } else { - *cpp = lsrp = (char *)ALIGN(buf); + *cpp = lsrp = buf; ep = lsrp + 1024; }