 @@ -1,14 +1,14 @@
-/* $NetBSD: subr_autoconf.c,v 1.271 2020/05/25 21:05:01 thorpej Exp $ */
+/* $NetBSD: subr_autoconf.c,v 1.272 2020/06/27 13:53:10 jmcneill Exp $ */
 /*
  * Copyright (c) 1996, 2000 Christopher G. Demetriou
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -67,27 +67,27 @@
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  * from: Header: subr_autoconf.c,v 1.12 93/02/01 19:31:48 torek Exp  (LBL)
+ *
  *	@(#)subr_autoconf.c	8.3 (Berkeley) 5/17/94
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_autoconf.c,v 1.271 2020/05/25 21:05:01 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_autoconf.c,v 1.272 2020/06/27 13:53:10 jmcneill Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_ddb.h"
 #include "drvctl.h"
 #endif
 #include <sys/param.h>
 #include <sys/device.h>
 #include <sys/disklabel.h>
 #include <sys/conf.h>
 #include <sys/kauth.h>
 #include <sys/kmem.h>
 #include <sys/systm.h>
 @@ -558,33 +558,33 @@ devmon_report_device(device_t dev, bool
 	const char *where;
 	device_t pdev = device_parent(dev);
 	/* If currently no drvctl device, just return */
 	if (devmon_insert_vec == no_devmon_insert)
 		return;
 	ev = prop_dictionary_create();
 	if (ev == NULL)
 		return;
 	what = (isattach ? "device-attach" : "device-detach");
 	parent = (pdev == NULL ? "root" : device_xname(pdev));
-	if (prop_dictionary_get_cstring_nocopy(dict, "location", &where)) {
+	if (prop_dictionary_get_string(dict, "location", &where)) {
-		prop_dictionary_set_cstring(ev, "location", where);
+		prop_dictionary_set_string(ev, "location", where);
 		aprint_debug("ev: %s %s at %s in [%s]\n",
 		    what, device_xname(dev), parent, where);
+	}
-	if (!prop_dictionary_set_cstring(ev, "device", device_xname(dev)) ||
+	if (!prop_dictionary_set_string(ev, "device", device_xname(dev)) ||
-	    !prop_dictionary_set_cstring(ev, "parent", parent)) {
+	    !prop_dictionary_set_string(ev, "parent", parent)) {
 		prop_object_release(ev);
 		return;
+	}
 	if ((*devmon_insert_vec)(what, ev) != 0)
 		prop_object_release(ev);
+}
 /*
  * Add a cfdriver to the system.
  */
 int
 config_cfdriver_attach(struct cfdriver *cd)
 @@ -1444,32 +1444,32 @@ config_devalloc(const device_t parent, c
 		dev->dv_depth = 0;
 	dev->dv_flags |= DVF_ACTIVE;	/* always initially active */
 	if (locs) {
 		KASSERT(parent); /* no locators at root */
 		ia = cfiattr_lookup(cfdata_ifattr(cf), parent->dv_cfdriver);
 		dev->dv_locators =
 		    kmem_alloc(sizeof(int [ia->ci_loclen + 1]), KM_SLEEP);
 		*dev->dv_locators++ = sizeof(int [ia->ci_loclen + 1]);
 		memcpy(dev->dv_locators, locs, sizeof(int [ia->ci_loclen]));
+	}
 	dev->dv_properties = prop_dictionary_create();
 	KASSERT(dev->dv_properties != NULL);
-	prop_dictionary_set_cstring_nocopy(dev->dv_properties,
+	prop_dictionary_set_string_nocopy(dev->dv_properties,
 	    "device-driver", dev->dv_cfdriver->cd_name);
 	prop_dictionary_set_uint16(dev->dv_properties,
 	    "device-unit", dev->dv_unit);
 	if (parent != NULL) {
-		prop_dictionary_set_cstring(dev->dv_properties,
+		prop_dictionary_set_string(dev->dv_properties,
 		    "device-parent", device_xname(parent));
+	}
 	if (dev->dv_cfdriver->cd_attrs != NULL)
 		config_add_attrib_dict(dev);
 	return dev;
+}
 /*
  * Create an array of device attach attributes and add it
  * to the device's dv_properties dictionary.
+ *
 @@ -1503,41 +1503,41 @@ config_add_attrib_dict(device_t dev)
 	int i, j;
 	const struct cfiattrdata *ci;
 	prop_dictionary_t attr_dict, loc_dict;
 	prop_array_t attr_array, loc_array;
 	if ((attr_array = prop_array_create()) == NULL)
 		return;
 	for (i = 0; ; i++) {
 		if ((ci = dev->dv_cfdriver->cd_attrs[i]) == NULL)
 			break;
 		if ((attr_dict = prop_dictionary_create()) == NULL)
 			break;
-		prop_dictionary_set_cstring_nocopy(attr_dict, "attribute-name",
+		prop_dictionary_set_string_nocopy(attr_dict, "attribute-name",
 		    ci->ci_name);
 		/* Create an array of the locator names and defaults */
 		if (ci->ci_loclen != 0 &&
 		    (loc_array = prop_array_create()) != NULL) {
 			for (j = 0; j < ci->ci_loclen; j++) {
 				loc_dict = prop_dictionary_create();
 				if (loc_dict == NULL)
 					continue;
-				prop_dictionary_set_cstring_nocopy(loc_dict,
+				prop_dictionary_set_string_nocopy(loc_dict,
 				    "loc-name", ci->ci_locdesc[j].cld_name);
 				if (ci->ci_locdesc[j].cld_defaultstr != NULL)
-					prop_dictionary_set_cstring_nocopy(
+					prop_dictionary_set_string_nocopy(
 					    loc_dict, "default",
 					    ci->ci_locdesc[j].cld_defaultstr);
 				prop_array_set(loc_array, j, loc_dict);
 				prop_object_release(loc_dict);
+			}
 			prop_dictionary_set_and_rel(attr_dict, "locators",
 			    loc_array);
+		}
 		prop_array_add(attr_array, attr_dict);
 		prop_object_release(attr_dict);
+	}
 	if (i == 0)
 		prop_object_release(attr_array);