Module Name: src
Committed By: thorpej
Date: Mon Jun 8 20:19:50 UTC 2020
Modified Files:
src/sys/kern: kern_module.c
Log Message:
Update for proplib(3) API changes.
To generate a diff of this commit:
cvs rdiff -u -r1.149 -r1.150 src/sys/kern/kern_module.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/kern_module.c
diff -u src/sys/kern/kern_module.c:1.149 src/sys/kern/kern_module.c:1.150
--- src/sys/kern/kern_module.c:1.149 Sat Apr 4 19:50:54 2020
+++ src/sys/kern/kern_module.c Mon Jun 8 20:19:50 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_module.c,v 1.149 2020/04/04 19:50:54 christos Exp $ */
+/* $NetBSD: kern_module.c,v 1.150 2020/06/08 20:19:50 thorpej Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_module.c,v 1.149 2020/04/04 19:50:54 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_module.c,v 1.150 2020/06/08 20:19:50 thorpej Exp $");
#define _MODULE_INTERNAL
@@ -1799,7 +1799,7 @@ module_merge_dicts(prop_dictionary_t exi
while ((props_obj = prop_object_iterator_next(props_iter)) != NULL) {
props_keysym = (prop_dictionary_keysym_t)props_obj;
- props_key = prop_dictionary_keysym_cstring_nocopy(props_keysym);
+ props_key = prop_dictionary_keysym_value(props_keysym);
props_obj = prop_dictionary_get_keysym(new_dict, props_keysym);
if ((props_obj == NULL) || !prop_dictionary_set(existing_dict,
props_key, props_obj)) {
