From owner-svn-src-head@freebsd.org Sat Aug 29 11:18:11 2020 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 8BF993D5427; Sat, 29 Aug 2020 11:18:11 +0000 (UTC) (envelope-from imp@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bdv8g2kHCz4KT8; Sat, 29 Aug 2020 11:18:11 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 40C9624D47; Sat, 29 Aug 2020 11:18:11 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 07TBIBYK062384; Sat, 29 Aug 2020 11:18:11 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 07TBIBs3062383; Sat, 29 Aug 2020 11:18:11 GMT (envelope-from imp@FreeBSD.org) Message-Id: <202008291118.07TBIBs3062383@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Sat, 29 Aug 2020 11:18:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r364951 - head/sys/kern X-SVN-Group: head X-SVN-Commit-Author: imp X-SVN-Commit-Paths: head/sys/kern X-SVN-Commit-Revision: 364951 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 29 Aug 2020 11:18:11 -0000 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);