git: 99651c30b15a - main - sbuf_delete() after sbuf_finish() & add SBUF_INCLUDENUL

The branch main has been updated by obrien:

URL: https://cgit.FreeBSD.org/src/commit/?id=99651c30b15afd085eca921a42e6ce2e67093609

commit 99651c30b15afd085eca921a42e6ce2e67093609
Author:     David E. O'Brien <obrien@FreeBSD.org>
AuthorDate: 2025-10-22 07:12:46 +0000
Commit:     David E. O'Brien <obrien@FreeBSD.org>
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);