svn commit: r364951 - head/sys/kern

Warner Losh imp at FreeBSD.org
Sat Aug 29 11:18:11 UTC 2020


Author: imp
Date: Sat Aug 29 11:18:10 2020
New Revision: 364951
URL: https://svnweb.freebsd.org/changeset/base/364951

Log:
  Use sbuf_cat instead of sbuf_cpy
  
  sbuf_cpy doesn't work with sysctl sbufs because of the drain function.

Modified:
  head/sys/kern/subr_bus.c

Modified: head/sys/kern/subr_bus.c
==============================================================================
--- head/sys/kern/subr_bus.c	Sat Aug 29 11:04:24 2020	(r364950)
+++ head/sys/kern/subr_bus.c	Sat Aug 29 11:18:10 2020	(r364951)
@@ -267,10 +267,10 @@ device_sysctl_handler(SYSCTL_HANDLER_ARGS)
 	sbuf_new_for_sysctl(&sb, NULL, 1024, req);
 	switch (arg2) {
 	case DEVICE_SYSCTL_DESC:
-		sbuf_cpy(&sb, dev->desc ? dev->desc : "");
+		sbuf_cat(&sb, dev->desc ? dev->desc : "");
 		break;
 	case DEVICE_SYSCTL_DRIVER:
-		sbuf_cpy(&sb, dev->driver ? dev->driver->name : "");
+		sbuf_cat(&sb, dev->driver ? dev->driver->name : "");
 		break;
 	case DEVICE_SYSCTL_LOCATION:
 		bus_child_location_sb(dev, &sb);
@@ -279,7 +279,7 @@ device_sysctl_handler(SYSCTL_HANDLER_ARGS)
 		bus_child_pnpinfo_sb(dev, &sb);
 		break;
 	case DEVICE_SYSCTL_PARENT:
-		sbuf_cpy(&sb, dev->parent ? dev->parent->nameunit : "");
+		sbuf_cat(&sb, dev->parent ? dev->parent->nameunit : "");
 		break;
 	default:
 		sbuf_delete(&sb);


More information about the svn-src-all mailing list