From nobody Fri Oct 31 05:31:22 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 4cyV2f2nMSz6FFRy; Fri, 31 Oct 2025 05:31:22 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cyV2f2Fl0z3CMm; Fri, 31 Oct 2025 05:31:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761888682; 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=VW+qjdcxU3FIEfe+5ZNyu5RZUqKVRcaJoIUW1Gn6+68=; b=Cl4p8wfoi5z15p1PqHJIb7bOCap++cpk5DO1j6w5K5wLJTcbdOk2ZYNu9BjGRDOXKN92vV LbCAS5nyFhEnDW7qKd1PiVCXbtQhcXm/XBO1XK8fTTYABFqhfPz2CZdp7ilG2yCVuEH3oh bA+zGtAIxPAYPR1ci5O+83XzDTEGbAp8KGx68jb7JS7qgWHLX5PI62zCjHqYq+qELeRWEm AULImbwA7YA9rvGA7VNqQiilEKOQ+dsijZIv83rfIyej1z63XtLPAWCdJhH4wZkOCa3U2s F4ftZ7lsQANtmQhcUPrd9PzR3NOvtBaN9Q0W70CZRwQKKqr6cQZ5lu8k4creSw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761888682; 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=VW+qjdcxU3FIEfe+5ZNyu5RZUqKVRcaJoIUW1Gn6+68=; b=VEYKcyTGAMbogNm+qex2jZN9gZbVwdyFLV5aEVqpWVbMo01UVx6II16xm3DDgkuJ79ougK goXdy1BK2EjqmmTeYVYAlu2nu1UUzLH+Xp1RwMbadxHosGetTvLfAtMkEPEOAPABMS+vmj eafFyP2wnxmjoRQdDiYNfCqt2rLLBpo2PuGHJIDGTXwHGsNTkf59wNhQk2hj/TdZAQMnnv ftHypa07/FUz55Oc2oQHb/GVffZT/4bezUjqBmO8fFUVuRjTCCEcV5RngEjWqJDqljIPGp YDzEICRwbZvvrr0juxWKxaH6nZjbWvjEqODcVnfjAau2QVe+GP+IMX+TkiseAQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761888682; a=rsa-sha256; cv=none; b=eBvQQ4tAkWZ4KLaQZFibDRugQ/qpjdC1rGJGeBo3k6OizJw364z+F6ijq5L9pj0w+XrCIM UUK+LAyM2N6UzhZfuKDwAlHPpBolDUUUIiJQfjt7DeXCXOmmapkVV6M/Fa4WiFZZcNNVT/ uItP3xuGZf8sfAyenlHVl1zU34SyvV+zVkseJvRdED090o5OKMaKTChCY+w4C5BHtuQwip mApEES2HIJA2pq071/X/dNaGJNx8qSx8tOQJmWppc/uoGe7PoL0/pKeFlQ005bO086zF5O E02trTUdZAluSDhlFBSwwu+UkEQeAavlbzOI6gTJFrTIpAKBik+nj2zfszh1ww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cyV2f1cqCzvYd; Fri, 31 Oct 2025 05:31:22 +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 59V5VMdH028415; Fri, 31 Oct 2025 05:31:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59V5VMPv028412; Fri, 31 Oct 2025 05:31:22 GMT (envelope-from git) Date: Fri, 31 Oct 2025 05:31:22 GMT Message-Id: <202510310531.59V5VMPv028412@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "David E. O'Brien" Subject: git: 99651c30b15a - main - sbuf_delete() after sbuf_finish() & add SBUF_INCLUDENUL 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: obrien X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 99651c30b15afd085eca921a42e6ce2e67093609 Auto-Submitted: auto-generated The branch main has been updated by obrien: URL: https://cgit.FreeBSD.org/src/commit/?id=99651c30b15afd085eca921a42e6ce2e67093609 commit 99651c30b15afd085eca921a42e6ce2e67093609 Author: David E. O'Brien AuthorDate: 2025-10-22 07:12:46 +0000 Commit: David E. O'Brien CommitDate: 2025-10-31 05:31:10 +0000 sbuf_delete() after sbuf_finish() & add SBUF_INCLUDENUL Reviewed by: adrian, imp Differential Revision: https://reviews.freebsd.org/D53254 --- sys/cam/cam_xpt.c | 8 +++++--- sys/dev/nvmf/controller/nvmft_controller.c | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/sys/cam/cam_xpt.c b/sys/cam/cam_xpt.c index cae29226d13c..a11b688c4456 100644 --- a/sys/cam/cam_xpt.c +++ b/sys/cam/cam_xpt.c @@ -1046,6 +1046,7 @@ xpt_announce_periph(struct cam_periph *periph, char *announce_string) sbuf_set_drain(&sb, sbuf_printf_drain, NULL); xpt_announce_periph_sbuf(periph, &sb, announce_string); (void)sbuf_finish(&sb); + (void)sbuf_delete(&sb); } void @@ -1122,6 +1123,7 @@ xpt_denounce_periph(struct cam_periph *periph) sbuf_set_drain(&sb, sbuf_printf_drain, NULL); xpt_denounce_periph_sbuf(periph, &sb); (void)sbuf_finish(&sb); + (void)sbuf_delete(&sb); } void @@ -5547,7 +5549,7 @@ xpt_cam_path_debug(struct cam_path *path, const char *fmt, ...) { struct sbuf sbuf; char buf[XPT_PRINT_LEN]; /* balance to not eat too much stack */ - struct sbuf *sb = sbuf_new(&sbuf, buf, sizeof(buf), SBUF_FIXEDLEN); + struct sbuf *sb = sbuf_new(&sbuf, buf, sizeof(buf), SBUF_FIXEDLEN | SBUF_INCLUDENUL); va_list ap; sbuf_set_drain(sb, sbuf_printf_drain, NULL); @@ -5566,7 +5568,7 @@ xpt_cam_dev_debug(struct cam_ed *dev, const char *fmt, ...) { struct sbuf sbuf; char buf[XPT_PRINT_LEN]; /* balance to not eat too much stack */ - struct sbuf *sb = sbuf_new(&sbuf, buf, sizeof(buf), SBUF_FIXEDLEN); + struct sbuf *sb = sbuf_new(&sbuf, buf, sizeof(buf), SBUF_FIXEDLEN | SBUF_INCLUDENUL); va_list ap; sbuf_set_drain(sb, sbuf_printf_drain, NULL); @@ -5585,7 +5587,7 @@ xpt_cam_debug(const char *fmt, ...) { struct sbuf sbuf; char buf[XPT_PRINT_LEN]; /* balance to not eat too much stack */ - struct sbuf *sb = sbuf_new(&sbuf, buf, sizeof(buf), SBUF_FIXEDLEN); + struct sbuf *sb = sbuf_new(&sbuf, buf, sizeof(buf), SBUF_FIXEDLEN | SBUF_INCLUDENUL); va_list ap; sbuf_set_drain(sb, sbuf_printf_drain, NULL); diff --git a/sys/dev/nvmf/controller/nvmft_controller.c b/sys/dev/nvmf/controller/nvmft_controller.c index 390467534ca2..e618972f46cf 100644 --- a/sys/dev/nvmf/controller/nvmft_controller.c +++ b/sys/dev/nvmf/controller/nvmft_controller.c @@ -31,7 +31,7 @@ nvmft_printf(struct nvmft_controller *ctrlr, const char *fmt, ...) va_list ap; size_t retval; - sbuf_new(&sb, buf, sizeof(buf), SBUF_FIXEDLEN); + sbuf_new(&sb, buf, sizeof(buf), SBUF_FIXEDLEN | SBUF_INCLUDENUL); sbuf_set_drain(&sb, sbuf_printf_drain, &retval); sbuf_printf(&sb, "nvmft%u: ", ctrlr->cntlid);