From nobody Mon Jun 16 15:12:29 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 4bLYQP4HyYz5q6BW; Mon, 16 Jun 2025 15:12:29 +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 4bLYQP3H70z3cpx; Mon, 16 Jun 2025 15:12:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750086749; 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=w//WeyaeB08MDzOGHSLZp37Lo6KZxenub3hk+xpuiOk=; b=NgDAURJxi4cOME0p4hfeZDJka+bVt/9PwHSf6Lh5S/NlEW+HxebVtwSQjka1paW/QEgasr Y6lRnhdAf3nFAjVUqGxq2oCXY/DfLqRkupmZyp3rLyzsgZTTvly+Y8rEf2zDMCxVSVv5PB 04G8O1velMMx6DDCPsKJgiOH3FjvBSnrheapoKq+JfXe0hzhqhk4me1SjxuU7hgMcpPtxP j/CGD/VXnYsMAMFUJ6YIAi+Pcfyi4dfQODpt7FlMwXp4uFOaIleQCSVxixoKdjhnpDbwaE Lpng5LLqLMhj4JWOntY2RgjhZw9XD1OGIX0IEW0RIfVkkzgiqGw89wgf8fAR4Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750086749; 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=w//WeyaeB08MDzOGHSLZp37Lo6KZxenub3hk+xpuiOk=; b=oeKk0ozxbLn22sFW3omPK9InaWS2/w0pTrZgrXniwsNU4Q9erWB5eDVMdwE25yw5dprGB6 8E57FALKZ3LSFHxkIKQ9CNBFxo5SyNJ7gd03Ap6TwXZWB29bKXRHi5bKk4LkNvP+ZnnDsQ XdExJm2q6jQfTXUsj4mN5CZV/aIPPTmIrTL4xZ5RLJUlPKDMmxs+Vp6JnYH8wPXU4lxXPr gpH11/yUbvAxzNmGUl203mlDaSSYnpgBXKFMa7E+DT925eeIDGQmuEv7kjMLaWoD9/PuoM jHepHK0h4HOBqVYYHrvht6JWsaWs9EhmHRVv2x4v2UW1rHD22KQv2LpATCdqgA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750086749; a=rsa-sha256; cv=none; b=K8+QGYkl/WwdnIOEPrBQbOkNJVEHLY+h2YKcz5zqDdVN47XMLjWhmEepqRYiVurqfyDRSW dhkncTwyfffwzpn3Ik2xRq9XkYqcFjZROIyR2+OI3cMIjYpkAERYwnvwhqCk/TaQyARzuf uzyjizbjOjqJoYBjP0KuVaNmAznv74JT+/9fHECxr2rhoToa7Z9Z50BZKetPoCVT2+aNGh U9Oa1RruepDAHzKGwyobeBeo7dkyzG9kFc4ttsFRGWXeOgZkaTP3jtq0DPNHolQBWUMFi1 TeOw+wFYxxGZOj5vB0tUY43hC2ESh4xJe8E7HFjKh0uAWjeiuw5WsSoCRcIfnw== 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 4bLYQP2tBZz13K2; Mon, 16 Jun 2025 15:12:29 +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 55GFCTfX057545; Mon, 16 Jun 2025 15:12:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55GFCTkg057542; Mon, 16 Jun 2025 15:12:29 GMT (envelope-from git) Date: Mon, 16 Jun 2025 15:12:29 GMT Message-Id: <202506161512.55GFCTkg057542@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 1025a1c090df - main - exterr: convert SET_ERRORX() to pseudo-variadic EXTERROR() 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1025a1c090dfcaa13bb25d1d1e2e2fa7009d63ca Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=1025a1c090dfcaa13bb25d1d1e2e2fa7009d63ca commit 1025a1c090dfcaa13bb25d1d1e2e2fa7009d63ca Author: Konstantin Belousov AuthorDate: 2025-06-14 13:53:33 +0000 Commit: Konstantin Belousov CommitDate: 2025-06-16 15:11:58 +0000 exterr: convert SET_ERRORX() to pseudo-variadic EXTERROR() Stealed from the CTR() macro in sys/ktr.h. Suggested by: jhb Reviewed by: markj Sponsored by: The FreeBSD Foundation Differential revision: https://reviews.freebsd.org/D50845 --- sys/sys/exterrvar.h | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/sys/sys/exterrvar.h b/sys/sys/exterrvar.h index d3c2c7c92d06..15557c614f88 100644 --- a/sys/sys/exterrvar.h +++ b/sys/sys/exterrvar.h @@ -36,11 +36,17 @@ #define SET_ERROR_MSG(mmsg) NULL #endif -#define SET_ERROR2(eerror, mmsg, pp1, pp2) \ +#define _SET_ERROR2(eerror, mmsg, pp1, pp2) \ exterr_set(eerror, EXTERR_CATEGORY, SET_ERROR_MSG(mmsg), \ (uintptr_t)(pp1), (uintptr_t)(pp2), __LINE__) -#define SET_ERROR0(eerror, mmsg) SET_ERROR2(eerror, mmsg, 0, 0) -#define SET_ERROR1(eerror, mmsg, pp1) SET_ERROR2(eerror, mmsg, pp1, 0) +#define _SET_ERROR0(eerror, mmsg) _SET_ERROR2(eerror, mmsg, 0, 0) +#define _SET_ERROR1(eerror, mmsg, pp1) _SET_ERROR2(eerror, mmsg, pp1, 0) + +#define _EXTERROR_MACRO(eerror, mmsg, _1, _2, NAME, ...) \ + NAME +#define EXTERROR(...) \ + _EXTERROR_MACRO(__VA_ARGS__, _SET_ERROR2, _SET_ERROR1, \ + _SET_ERROR0)(__VA_ARGS__) int exterr_set(int eerror, int category, const char *mmsg, uintptr_t pp1, uintptr_t pp2, int line);