From nobody Tue Jan 27 18:43:56 2026 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 4f0vSY57Dwz6QFV6 for ; Tue, 27 Jan 2026 18:43:57 +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 4f0vSX6Jsrz3qd6 for ; Tue, 27 Jan 2026 18:43:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769539436; 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=ENkwkoeKlvHOkO3fIfsfdTiezV0EM/uXrjV+fosWN7s=; b=Ise+Zn7fjK49cBTYsTkakGkKsCQlyNqXqLwnXxvgB55h0rA8gOUMFLBFWV/R5P5/qaxoJC 6yD8uafMFrrDE9Y9OmrsOJZ+RstyH4RiGwVnD5n51KR4Vnuaad5strMEXxYFEKhDPoJvZP pzUnZXnssMTdkKF/GXBI9BQPSw/G+xTk42GT3yGuoC6bd7+MwctkM/FlxR0cNvzTvWz4eO WlmhFhgUYl6hzExN7AaNcdGpcSEdO5Yo22KZOQP7pmWWMPFpCZ1DOTetgnSuPeAk+dHki/ RmOJDvl98Sz+qengCqkt8PPKwwnqVvmdkkUrGFvI6aP4hmObYR+fQ+wjs97oEQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769539436; 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=ENkwkoeKlvHOkO3fIfsfdTiezV0EM/uXrjV+fosWN7s=; b=c8ElMHQXV/JvH5dwtxtFLsdzisNs71LaRNUI9NLRUEjFjHB5eSdGAI50DmPubTbyh1RqTd nEcdB241pqknX4bz8grJqfv9B3a71rrC2DHv89L2dYTWotmyEawsntNPXp7LVUgI4UfAMf SkcbcfgL9GtjkVC+NnB+TKUua+bts5P3cbXfsmF+WDzgf4SDiOttVAvYQPa6X5EZGp+VZY Il0Ln0E6UTRzcZmGHUEA6/pLbm7JFG+ev4ifNF/orXs2zoMfSvJaSYyBIh2lsn+9rqyPNn 8ljBBXmDl/Ms6gTX6RD0NCXaTp5VYDcTvR8xmpWvTCSiWUqUvT3iH9c2t+5/gA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769539436; a=rsa-sha256; cv=none; b=qY5w/dCPlcMaUWNCpqDDN7nXCZbcDFEjDcThtthD1dzQyyL1S8DqahV9AwCMahWKnsqSOg PEstWbgcsyQ+ejUagtvGKHIPOZhEn10X7bjSxVKV56T3Z0dYoZB/jv2+I6MTbs6PD1rGCI Ii2kgKN+CAebG+td4Qu4ZZDJ1lflbGnGQGZEBMpopykZERqTHqKg8pIdTvAxd4OQ/J/GXt b/d3/98nI6PCQOXYRAUfGtGjNqVGOVXVavS9J6JqQm+Dg/GGumdmiOFDLDmbuTllX8QenP m5KPDFV8bIREYS1Sx0GSUZghHRFLQcGsSKpMSmYqETy9aAUTYyNyEEFb1wLN6A== 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 4f0vSX5hfmz3h4 for ; Tue, 27 Jan 2026 18:43:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id fffc by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 27 Jan 2026 18:43:56 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: def239812e9c - stable/14 - libiscsiutil: Add log_warnc() and log_errc() functions 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: def239812e9c8c80c8ec14a2f29f2676d60fbf61 Auto-Submitted: auto-generated Date: Tue, 27 Jan 2026 18:43:56 +0000 Message-Id: <6979076c.fffc.48db7adb@gitrepo.freebsd.org> The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=def239812e9c8c80c8ec14a2f29f2676d60fbf61 commit def239812e9c8c80c8ec14a2f29f2676d60fbf61 Author: John Baldwin AuthorDate: 2025-01-30 15:15:39 +0000 Commit: John Baldwin CommitDate: 2026-01-27 18:15:56 +0000 libiscsiutil: Add log_warnc() and log_errc() functions These are similar to warnc() and errc() in that they take an explicit error code instead of using the value of the errno global. Reviewed by: mav, asomers Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D48648 (cherry picked from commit de3deff65c5b407ab29b45780f2585b3bc24bbd6) --- lib/libiscsiutil/libiscsiutil.h | 4 ++++ lib/libiscsiutil/log.c | 22 ++++++++++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/lib/libiscsiutil/libiscsiutil.h b/lib/libiscsiutil/libiscsiutil.h index 8da6ead73fce..c091c1d9753a 100644 --- a/lib/libiscsiutil/libiscsiutil.h +++ b/lib/libiscsiutil/libiscsiutil.h @@ -162,9 +162,13 @@ void log_set_peer_name(const char *name); void log_set_peer_addr(const char *addr); void log_err(int, const char *, ...) __dead2 __printflike(2, 3); +void log_errc(int, int, const char *, ...) + __dead2 __printflike(3, 4); void log_errx(int, const char *, ...) __dead2 __printflike(2, 3); void log_warn(const char *, ...) __printflike(1, 2); +void log_warnc(int, const char *, ...) + __printflike(2, 3); void log_warnx(const char *, ...) __printflike(1, 2); void log_debugx(const char *, ...) __printflike(1, 2); diff --git a/lib/libiscsiutil/log.c b/lib/libiscsiutil/log.c index a69c979c3cce..cead4ab2d709 100644 --- a/lib/libiscsiutil/log.c +++ b/lib/libiscsiutil/log.c @@ -152,6 +152,18 @@ log_err(int eval, const char *fmt, ...) exit(eval); } +void +log_errc(int eval, int code, const char *fmt, ...) +{ + va_list ap; + + va_start(ap, fmt); + log_common(LOG_CRIT, code, fmt, ap); + va_end(ap); + + exit(eval); +} + void log_errx(int eval, const char *fmt, ...) { @@ -174,6 +186,16 @@ log_warn(const char *fmt, ...) va_end(ap); } +void +log_warnc(int code, const char *fmt, ...) +{ + va_list ap; + + va_start(ap, fmt); + log_common(LOG_WARNING, code, fmt, ap); + va_end(ap); +} + void log_warnx(const char *fmt, ...) {