From nobody Tue Jun 3 14:21:07 2025 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 4bBXv75h8Pz5xj0S; Tue, 03 Jun 2025 14:21:07 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bBXv71N7yz3xrh; Tue, 03 Jun 2025 14:21:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748960467; 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=yxACp3Uf0Qvj67UQqy4GhodFa5nlUfPTOkS+KskVd8M=; b=PMRKF+wLQaQXDP0+tRNrZD4JuYOdEAfQvA0f7IyB2u7xSOePxSioxDy6uN94rc2KP1DgvC pSl3SgZpBAsl3vI0QuNmcEWudTa/fY9BSM4r0Z9W/WI03PqhW5sW7QS7XrmPTPuDq8/ixt YD+oWAjoTbRY4//ph1YBxm0m99SOWrYF67AOIswBSOywHk3YZoVJOJCu5loPpPTw8OPWET 6CBeklVgFXGngFCkqNiXUz5btqMDOeNOLwOE61v6X1sw8gvZlRZWSu4z+285qjswP5AZd/ mq4DtQB0TBpA/F7F1IPPthBuvIBGF0hE4TNJoUFHxKVuZffAms/Wmd48YXorfA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748960467; 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=yxACp3Uf0Qvj67UQqy4GhodFa5nlUfPTOkS+KskVd8M=; b=VISbxSP4ktpaxqJrN3yb6OJ5az0+sF1MpHO+YScDsvgYaoWBjXCXdjQlNfrmyQniVPGcq3 Sm+rUS4+XLJYLTFd9zpBR7SvAisnI9gnY7cfrv729wcy2PkqcHPfTaN3N7tj8Py7eNbBGy hYBvPo7FzbR/IOmyHIzYFhDMl0GjiO8acGQeoebGup7D3nQgndqeyqKj6xK1znce6H8nFo BldiJKWSyClXUC9/Fo9/DGcMjICSgbHZg67o4gpAc9wvr/hjNbTUiZNmXp+5sCYbE2Sn44 /dhUjUmKZuJXiMoGF2Fydpd29IbhYRx/KuJGm9zwhwOtOn4/NCNmyfD+py2G/A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748960467; a=rsa-sha256; cv=none; b=dI/bigIIYxLFHEqD0tF2iKHQgL+2HwNPbQnOkDYFLXTAhsHNHvEw1ynKieXoifYI0shs+L vK9uE6v495xJjguSZ//QBBhGh9MyNQlgG1OrbIQD/g6uODMGYaLP9tkcFZ4bgLqocOVsfW mTiEIgBjbnNcu3Yr5akRVP+hDeJDrq5BSi/jkB1sScn8YIPzDyhh9HH0tqBszYFxo9OeOx fI/5HKXWeX6j3cOCUa6iW6w+ASdNmjJA8mPEa98ZvkKUmH/ydR0RdxSCCFe1tM4YpmRIIS X9sibAJk474xwQWVyKIqzq0GBw5QTJOgtQmitGw2yyMiO6izOHpJ4C0DvlhOUQ== 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 4bBXv70hnhzhcl; Tue, 03 Jun 2025 14:21:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 553EL7wu024765; Tue, 3 Jun 2025 14:21:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 553EL7wr024762; Tue, 3 Jun 2025 14:21:07 GMT (envelope-from git) Date: Tue, 3 Jun 2025 14:21:07 GMT Message-Id: <202506031421.553EL7wr024762@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: 786ced56a434 - main - libc: Fix glob.c build with GCC 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: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 786ced56a43443400c12b73323a9f1da7b3db2ba Auto-Submitted: auto-generated The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=786ced56a43443400c12b73323a9f1da7b3db2ba commit 786ced56a43443400c12b73323a9f1da7b3db2ba Author: Jessica Clarke AuthorDate: 2025-06-03 14:19:04 +0000 Commit: Jessica Clarke CommitDate: 2025-06-03 14:19:04 +0000 libc: Fix glob.c build with GCC We don't expose the dummy struct pointer in the header file, so gl_errblk is just a void * when lacking compiler support for blocks and we need to cast to the former for CALL_BLOCK to work. If blocks support is present this should be a redundant cast to the type that gl_errblk already is. Fixes: 1e0743f54d2d ("glob: Add blocks support") --- lib/libc/gen/glob.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/libc/gen/glob.c b/lib/libc/gen/glob.c index 1ac919edaa12..921db0a7b5a8 100644 --- a/lib/libc/gen/glob.c +++ b/lib/libc/gen/glob.c @@ -1121,7 +1121,8 @@ err_aborted(glob_t *pglob, int err, char *buf) if ((pglob->gl_flags & _GLOB_ERR_BLOCK) != 0) { if (pglob->gl_errblk != NULL) - rv = CALL_BLOCK(pglob->gl_errblk, buf, errno); + rv = CALL_BLOCK((glob_b_block)pglob->gl_errblk, buf, + errno); } else if (pglob->gl_errfunc != NULL) { rv = pglob->gl_errfunc(buf, errno); }