From nobody Sun Oct 25 17:34:32 2026 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 4jCP5N2dxdz6wq3l for ; Sun, 25 Oct 2026 17:34:32 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jCP5N1zfJz3Ft4 for ; Sun, 25 Oct 2026 17:34:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1792949672; 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=UdGaaR/pyzFuZY8fA3OKUENCC/kJ8zsO0libTZjFu1k=; b=fBpL3jmWCzKkLPNEfSQr3f6/22HUqyWSPvYzplOafWEsLUGoh4zZv8HCcdbK3kh6No58lr V+EhrOCFvuAdjZC4UVdXh09y7YEWW/xPVzlYpYtQwa8BPKRtT75G9tAAXUA6UPgd3G8Gll XFGruZ0a/28Df7JzzV/obVI6OnQOnnKftzoujoqukTRQAUUE1L4uNNjb+HCLrUB1BjtZA7 LLbhflEtwQMGGslngEYlooPO/aWl8w0u7JanlpI51plam9g3MlrhmPs7tzNq8eSzm/1fr4 ba03pxlg/K09+9rxYwWC6sHCcX1STHemgrpiWwVJXINzhawalNMxro0qHQzimg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1792949672; b=Al0HQ1INco2JlGjFAyL/TpD9LZdb9ttEt9gOrklEjT8MR8SEmQl9E/qYAMrREmURypyoeB /qHHTOcHO35Ll7lKiOep3RW9GtQpK25E/BdRys5jGCwuRnAvVax1i60YnbTftJo3yj+3V9 mCOW3BzohEsXGTzJBBA0Xh6GUIUtkduVnn+EAFQenH/WPyoXjtXCoB86ysnpbpp591hX6m Encljakux3MWnqvHXD9GvT541kW0RVhGbeGmmxt3MmZWTXoGANvgEi6KpLQNRiOaUOpG5Z 9qKNlUPSIp+fCAkvlPDmhMis4S1NhSh/O0GwvSJYVoV1MJWlkz7EERhkwJTH8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1792949672; 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=UdGaaR/pyzFuZY8fA3OKUENCC/kJ8zsO0libTZjFu1k=; b=uoWfOJJ26+9XTVDbWZIPB0pnj4Jnh3szDP5BvEeg6ekURvX3r0hBqZQibHhEEhFekIgm21 /BH86tByyph97w8vuvnCc4b3ggaNmYiM68mk/Kqjdljc8cfC50i/TDH5MzVuNSU1xzUNki eLBrYERC8WBlOD/HX3mCtqyMoU07VudphVBLbdWTqNuthvLwhIKWIiftVysou9MsccCV39 Vz2rIPlBc6l0h4lrX43nwWDVhkwaVXdcLaDmSpsnKnD0RqNida/BdcjccjJR666JSvlmoJ OMY/MaY+OSobACWrBpouZ1KeeIWs3DuYV1+SEqdpbl4+KKl8+9j5nwlOc4j/NA== 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 4jCP5N1fHwzwVS for ; Sun, 25 Oct 2026 17:34:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1ef57 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 25 Oct 2026 17:34:32 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: e2979f4cbbf6 - main - rtld: some cosmetics in donelist_init() List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org List-Id: Commit messages for the main branch of the src repository 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e2979f4cbbf6546daa7ad9fd1cd544d22c286315 Auto-Submitted: auto-generated Date: Sun, 25 Oct 2026 17:34:32 +0000 Message-Id: <6ade3da8.1ef57.1f52d715@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=e2979f4cbbf6546daa7ad9fd1cd544d22c286315 commit e2979f4cbbf6546daa7ad9fd1cd544d22c286315 Author: Konstantin Belousov AuthorDate: 2026-10-25 15:30:20 +0000 Commit: Konstantin Belousov CommitDate: 2026-10-25 17:33:46 +0000 rtld: some cosmetics in donelist_init() Add a missing word in the comment. Make each assignment a separate statement. Fix formatting. Fixes: 1e370f038778 ("rtld: stop using unbound alloca()") Sponsored by: The FreeBSD Foundation MFC after: 1 week --- libexec/rtld-elf/rtld.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c index 0ff7d1bb5227..877449296643 100644 --- a/libexec/rtld-elf/rtld.c +++ b/libexec/rtld-elf/rtld.c @@ -1034,20 +1034,20 @@ _rtld(Elf_Addr *sp, func_ptr_type *exit_proc, Obj_Entry **objp) /* * Fill in a DoneList with an allocation large enough to hold all of - * the currently-loaded Keep this as a macro since it calls - * alloca and we want that to occur within the scope of the caller. + * the currently-loaded objects. Keep this as a macro since it calls + * alloca() and we want that to occur within the scope of the caller. */ #define DLP_ALLOCA_LIMIT 100 /* 800 bytes on LP64 */ -#define donelist_init(_DLP, _REQ) do { \ +#define donelist_init(_DLP, _REQ) do { \ DoneList *_dlp = _DLP; \ SymLook *_r = _REQ; \ - _dlp->num_alloc = obj_count, \ + _dlp->num_alloc = obj_count; \ _dlp->req = NULL; \ if (_dlp->num_alloc > DLP_ALLOCA_LIMIT) { \ _dlp->objs = xcalloc(_dlp->num_alloc, sizeof(_dlp->objs[0])); \ if (_r != NULL && _r->donelist_mem == NULL) { \ _r->donelist_mem = _dlp->objs; \ - _dlp->req = _r; \ + _dlp->req = _r; \ } \ } else { \ _dlp->objs = alloca(_dlp->num_alloc * sizeof(_dlp->objs[0])); \