From nobody Mon Dec 22 15:50:34 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 4dZjK73Qbmz6LMnd for ; Mon, 22 Dec 2025 15:50:35 +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 4dZjK65NnSz3Y7N for ; Mon, 22 Dec 2025 15:50:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766418634; 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=xtVldstdwKXGpGG3jUO+RFC2irSWx7cTlIoN+GPE4QY=; b=DETh8qIoDeyCP3Tpv0nDGKaQepDRmZcXVeFH9B66Q26dQMZSA0RFHivcBIXebeaNwlZ1WX fx9XUcjsg4UXr+2ivlv0/1zD8P0HdLLB8f1Hz5LI5wf2LSej158hIDbtWBTf7yNsFSbN/s 64vTUfo44e6d3Lj5OA+X5aaZzzocxpEk6QPalEbK2zYpKeqyNe1oeBXvYVET+1rza63QhY 2vFyplNuqrdgttFu3CLhsk9G23ZSJVQxqO0aazMpsTxBSSJyK7fpaBY0PberWnNitIt7RJ hYu9RGEsEcaH+uQMkDtPqBaGl5jDOTCRWH4gzfEnVCo6hx/gC5tQn6dAPVjMhg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766418634; 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=xtVldstdwKXGpGG3jUO+RFC2irSWx7cTlIoN+GPE4QY=; b=c8Dud4Mnowyl4l7hS0jbQydNjlZwv0WrUDCWQOAkLf39okOG9oO6yNqvAY/Na6GBdPRaiC 2cHafiyxUyMIhRyhq0MXgP3slG/cgnmFp0Hddb8Q258pSENIs0zgMgeKVUdUfsD+1CETqK gLyUdkilAMc50joSQH4IuXtOaSC5IVwUz8GvEMS7qvKTFBMDpz+rA3PLkC8+jQ9ZkAysFn z6NhHZkW4pqrAiY2iMmIBetF9tHkcGCpma1z7WL2gc7hBjC8HCNL4QMHsr4AjwMe+KM/Mx JIasJo3XiFPa8Cb5HDmRblZYwzEqEshtIO4cdBLUbnt0vWzB45oRIc5cJ9/3Tw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766418634; a=rsa-sha256; cv=none; b=gFl9MHK7VFj/FLXp7/FLWzZlZ6id0UVvb1R0Ie0fpwBex9dd9pSadFJCUK1MWT8DQfY6aG hHFtrY+8zG/BePLBdutIJeeVP5i1RrEQJUB+LolTg6JcwZycOEzeqJ8FGPn2GYjRVzKjAw syRvtPfkEoBkXkruBOO8kh04ISA65TuehoeRCMoB6V/MOMEXcuL5QwrMQyCX9FvkcIptcY A7YgzRLIdaNoSFDDlc/tJfQH8VqYMaZHPnJez5OIkABaK5La/lEFS71zKDaYEiMJEtBiu/ QjWaQqFw3VB8abU0rk005QPO1pPIv6onIoHvDd/Stb5XRXIlpa6MXAXtc38EnA== 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 4dZjK64NY4zYgl for ; Mon, 22 Dec 2025 15:50:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 458ee by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 22 Dec 2025 15:50:34 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 3a4275a5f1f5 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 3a4275a5f1f5dccd6918c4eff3b84488e322ad5d Auto-Submitted: auto-generated Date: Mon, 22 Dec 2025 15:50:34 +0000 Message-Id: <694968ca.458ee.2105ea40@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=3a4275a5f1f5dccd6918c4eff3b84488e322ad5d commit 3a4275a5f1f5dccd6918c4eff3b84488e322ad5d Author: Mark Johnston AuthorDate: 2025-12-22 15:18:52 +0000 Commit: Mark Johnston CommitDate: 2025-12-22 15:18:52 +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 --- 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; }