 @@ -1,159 +1,159 @@
-/*     $NetBSD: prop_array.h,v 1.10 2011/01/19 20:34:23 bouyer Exp $    */
+/*     $NetBSD: prop_array.h,v 1.11 2011/01/20 11:17:58 bouyer Exp $    */
 /*-
  * Copyright (c) 2006, 2009 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe.
+ *
  * 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.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL 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.
  */
 #ifndef _PROPLIB_PROP_ARRAY_H_
 #define	_PROPLIB_PROP_ARRAY_H_
 #include <prop/prop_object.h>
 typedef struct _prop_array *prop_array_t;
 __BEGIN_DECLS
 prop_array_t	prop_array_create(void);
 prop_array_t	prop_array_create_with_capacity(unsigned int);
 prop_array_t	prop_array_copy(prop_array_t);
 prop_array_t	prop_array_copy_mutable(prop_array_t);
 unsigned int	prop_array_capacity(prop_array_t);
 unsigned int	prop_array_count(prop_array_t);
 bool		prop_array_ensure_capacity(prop_array_t, unsigned int);
 void		prop_array_make_immutable(prop_array_t);
 bool		prop_array_mutable(prop_array_t);
 prop_object_iterator_t prop_array_iterator(prop_array_t);
 prop_object_t	prop_array_get(prop_array_t, unsigned int);
 bool		prop_array_set(prop_array_t, unsigned int, prop_object_t);
 bool		prop_array_add(prop_array_t, prop_object_t);
 void		prop_array_remove(prop_array_t, unsigned int);
 bool		prop_array_equals(prop_array_t, prop_array_t);
 char *		prop_array_externalize(prop_array_t);
 prop_array_t	prop_array_internalize(const char *);
 bool		prop_array_externalize_to_file(prop_array_t, const char *);
 prop_array_t	prop_array_internalize_from_file(const char *);
 #if defined(__NetBSD__)
 struct plistref;
 #if !defined(_KERNEL) && !defined(_STANDALONE)
 bool		prop_array_externalize_to_pref(prop_array_t, struct plistref *);
 int		prop_array_send_ioctl(prop_array_t, int, unsigned long);
 int		prop_array_recv_ioctl(int, unsigned long, prop_array_t *);
 bool		prop_array_send_syscall(prop_array_t, struct plistref *);
 bool		prop_array_recv_syscall(const struct plistref *,
 					prop_array_t *);
 #elif defined(_KERNEL)
 int		prop_array_copyin(const struct plistref *, prop_array_t *);
-int		prop_array_copyout(struct plistref *, prop_array_t *);
+int		prop_array_copyout(struct plistref *, prop_array_t);
 int		prop_array_copyin_ioctl(const struct plistref *, const u_long,
 					prop_array_t *);
 int		prop_array_copyout_ioctl(struct plistref *, const u_long,
 					 prop_array_t);
 #endif
 #endif /* __NetBSD__ */
 /*
  * Utility routines to make it more convenient to work with values
  * stored in dictionaries.
  */
 bool		prop_array_get_bool(prop_array_t, unsigned int,
 					 bool *);
 bool		prop_array_set_bool(prop_array_t, unsigned int,
 					 bool);
 bool		prop_array_get_int8(prop_array_t, unsigned int,
 					 int8_t *);
 bool		prop_array_get_uint8(prop_array_t, unsigned int,
 					  uint8_t *);
 bool		prop_array_set_int8(prop_array_t, unsigned int,
 					 int8_t);
 bool		prop_array_set_uint8(prop_array_t, unsigned int,
 					  uint8_t);
 bool		prop_array_get_int16(prop_array_t, unsigned int,
 					  int16_t *);
 bool		prop_array_get_uint16(prop_array_t, unsigned int,
 					   uint16_t *);
 bool		prop_array_set_int16(prop_array_t, unsigned int,
 					  int16_t);
 bool		prop_array_set_uint16(prop_array_t, unsigned int,
 					   uint16_t);
 bool		prop_array_get_int32(prop_array_t, unsigned int,
 					  int32_t *);
 bool		prop_array_get_uint32(prop_array_t, unsigned int,
 					   uint32_t *);
 bool		prop_array_set_int32(prop_array_t, unsigned int,
 					  int32_t);
 bool		prop_array_set_uint32(prop_array_t, unsigned int,
 					   uint32_t);
 bool		prop_array_get_int64(prop_array_t, unsigned int,
 					  int64_t *);
 bool		prop_array_get_uint64(prop_array_t, unsigned int,
 					   uint64_t *);
 bool		prop_array_set_int64(prop_array_t, unsigned int,
 					  int64_t);
 bool		prop_array_set_uint64(prop_array_t, unsigned int,
 					   uint64_t);
 bool		prop_array_add_int8(prop_array_t, int8_t);
 bool		prop_array_add_uint8(prop_array_t, uint8_t);
 bool		prop_array_add_int16(prop_array_t, int16_t);
 bool		prop_array_add_uint16(prop_array_t, uint16_t);
 bool		prop_array_add_int32(prop_array_t, int32_t);
 bool		prop_array_add_uint32(prop_array_t, uint32_t);
 bool		prop_array_add_int64(prop_array_t, int64_t);
 bool		prop_array_add_uint64(prop_array_t, uint64_t);
 bool		prop_array_get_cstring(prop_array_t, unsigned int,
 					     char **);
 bool		prop_array_set_cstring(prop_array_t, unsigned int,
 					    const char *);
 bool		prop_array_get_cstring_nocopy(prop_array_t,
                                                    unsigned int,
 						   const char **);
 bool		prop_array_set_cstring_nocopy(prop_array_t,
 						   unsigned int,
 						   const char *);
 __END_DECLS
 #endif /* _PROPLIB_PROP_ARRAY_H_ */

 @@ -1,173 +1,173 @@
-/*	$NetBSD: prop_dictionary.h,v 1.11 2011/01/19 20:34:23 bouyer Exp $	*/
+/*	$NetBSD: prop_dictionary.h,v 1.12 2011/01/20 11:17:58 bouyer Exp $	*/
 /*-
  * Copyright (c) 2006, 2009 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe.
+ *
  * 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.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL 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.
  */
 #ifndef _PROPLIB_PROP_DICTIONARY_H_
 #define	_PROPLIB_PROP_DICTIONARY_H_
 #include <prop/prop_object.h>
 typedef struct _prop_dictionary *prop_dictionary_t;
 typedef struct _prop_dictionary_keysym *prop_dictionary_keysym_t;
 __BEGIN_DECLS
 prop_dictionary_t prop_dictionary_create(void);
 prop_dictionary_t prop_dictionary_create_with_capacity(unsigned int);
 prop_dictionary_t prop_dictionary_copy(prop_dictionary_t);
 prop_dictionary_t prop_dictionary_copy_mutable(prop_dictionary_t);
 unsigned int	prop_dictionary_count(prop_dictionary_t);
 bool		prop_dictionary_ensure_capacity(prop_dictionary_t,
 						unsigned int);
 void		prop_dictionary_make_immutable(prop_dictionary_t);
 bool		prop_dictionary_mutable(prop_dictionary_t);
 prop_object_iterator_t prop_dictionary_iterator(prop_dictionary_t);
 prop_array_t	prop_dictionary_all_keys(prop_dictionary_t);
 prop_object_t	prop_dictionary_get(prop_dictionary_t, const char *);
 bool		prop_dictionary_set(prop_dictionary_t, const char *,
 				    prop_object_t);
 void		prop_dictionary_remove(prop_dictionary_t, const char *);
 prop_object_t	prop_dictionary_get_keysym(prop_dictionary_t,
 					   prop_dictionary_keysym_t);
 bool		prop_dictionary_set_keysym(prop_dictionary_t,
 					   prop_dictionary_keysym_t,
 					   prop_object_t);
 void		prop_dictionary_remove_keysym(prop_dictionary_t,
 					      prop_dictionary_keysym_t);
 bool		prop_dictionary_equals(prop_dictionary_t, prop_dictionary_t);
 char *		prop_dictionary_externalize(prop_dictionary_t);
 prop_dictionary_t prop_dictionary_internalize(const char *);
 bool		prop_dictionary_externalize_to_file(prop_dictionary_t,
 						    const char *);
 prop_dictionary_t prop_dictionary_internalize_from_file(const char *);
 const char *	prop_dictionary_keysym_cstring_nocopy(prop_dictionary_keysym_t);
 bool		prop_dictionary_keysym_equals(prop_dictionary_keysym_t,
 					      prop_dictionary_keysym_t);
 #if defined(__NetBSD__)
 struct plistref;
 #if !defined(_KERNEL) && !defined(_STANDALONE)
 bool		prop_dictionary_externalize_to_pref(prop_dictionary_t, struct plistref *);
 int		prop_dictionary_send_ioctl(prop_dictionary_t, int,
 					   unsigned long);
 int		prop_dictionary_recv_ioctl(int, unsigned long,
 					   prop_dictionary_t *);
 int		prop_dictionary_sendrecv_ioctl(prop_dictionary_t,
 					       int, unsigned long,
 					       prop_dictionary_t *);
 bool		prop_dictionary_send_syscall(prop_dictionary_t,
 		     struct plistref *);
 bool		prop_dictionary_recv_syscall(const struct plistref *,
 					   prop_dictionary_t *);
 #elif defined(_KERNEL)
 int		prop_dictionary_copyin(const struct plistref *,
 				       prop_dictionary_t *);
 int		prop_dictionary_copyout(struct plistref *,
-				       prop_dictionary_t *);
+				       prop_dictionary_t);
 int		prop_dictionary_copyin_ioctl(const struct plistref *,
 					     const u_long,
 					     prop_dictionary_t *);
 int		prop_dictionary_copyout_ioctl(struct plistref *,
 					      const u_long,
 					      prop_dictionary_t);
 #endif
 #endif /* __NetBSD__ */
 /*
  * Utility routines to make it more convenient to work with values
  * stored in dictionaries.
  */
 bool		prop_dictionary_get_bool(prop_dictionary_t, const char *,
 					 bool *);
 bool		prop_dictionary_set_bool(prop_dictionary_t, const char *,
 					 bool);
 bool		prop_dictionary_get_int8(prop_dictionary_t, const char *,
 					 int8_t *);
 bool		prop_dictionary_get_uint8(prop_dictionary_t, const char *,
 					  uint8_t *);
 bool		prop_dictionary_set_int8(prop_dictionary_t, const char *,
 					 int8_t);
 bool		prop_dictionary_set_uint8(prop_dictionary_t, const char *,
 					  uint8_t);
 bool		prop_dictionary_get_int16(prop_dictionary_t, const char *,
 					  int16_t *);
 bool		prop_dictionary_get_uint16(prop_dictionary_t, const char *,
 					   uint16_t *);
 bool		prop_dictionary_set_int16(prop_dictionary_t, const char *,
 					  int16_t);
 bool		prop_dictionary_set_uint16(prop_dictionary_t, const char *,
 					   uint16_t);
 bool		prop_dictionary_get_int32(prop_dictionary_t, const char *,
 					  int32_t *);
 bool		prop_dictionary_get_uint32(prop_dictionary_t, const char *,
 					   uint32_t *);
 bool		prop_dictionary_set_int32(prop_dictionary_t, const char *,
 					  int32_t);
 bool		prop_dictionary_set_uint32(prop_dictionary_t, const char *,
 					   uint32_t);
 bool		prop_dictionary_get_int64(prop_dictionary_t, const char *,
 					  int64_t *);
 bool		prop_dictionary_get_uint64(prop_dictionary_t, const char *,
 					   uint64_t *);
 bool		prop_dictionary_set_int64(prop_dictionary_t, const char *,
 					  int64_t);
 bool		prop_dictionary_set_uint64(prop_dictionary_t, const char *,
 					   uint64_t);
 bool		prop_dictionary_get_cstring(prop_dictionary_t, const char *,
 					     char **);
 bool		prop_dictionary_set_cstring(prop_dictionary_t, const char *,
 					    const char *);
 bool		prop_dictionary_get_cstring_nocopy(prop_dictionary_t,
 						   const char *,
 						   const char **);
 bool		prop_dictionary_set_cstring_nocopy(prop_dictionary_t,
 						   const char *,
 						   const char *);
 __END_DECLS
 #endif /* _PROPLIB_PROP_DICTIONARY_H_ */

 @@ -1,523 +1,523 @@
-/*	$NetBSD: prop_kern.c,v 1.15 2011/01/19 20:34:23 bouyer Exp $	*/
+/*	$NetBSD: prop_kern.c,v 1.16 2011/01/20 11:17:58 bouyer Exp $	*/
 /*-
  * Copyright (c) 2006, 2009 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe.
+ *
  * 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.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL 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.
  */
 #if defined(__NetBSD__)
 #include <sys/types.h>
 #include <sys/ioctl.h>
 #include <prop/proplib.h>
 #if !defined(_KERNEL) && !defined(_STANDALONE)
 #include <sys/mman.h>
 #include <errno.h>
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
 #ifdef RUMP_ACTION
 #include <rump/rump_syscalls.h>
 #define ioctl(a,b,c) rump_sys_ioctl(a,b,c)
 #endif
 static int
 _prop_object_externalize_to_pref(prop_object_t obj, struct plistref *pref, char **bufp)
+{
 	char *buf;
 	switch (prop_object_type(obj)) {
 	case PROP_TYPE_DICTIONARY:
 		buf = prop_dictionary_externalize(obj);
 		break;
 	case PROP_TYPE_ARRAY:
 		buf = prop_array_externalize(obj);
 		break;
 	default:
 		return (ENOTSUP);
+	}
 	if (buf == NULL) {
 		/* Assume we ran out of memory. */
 		return (ENOMEM);
+	}
 	pref->pref_plist = buf;
 	pref->pref_len = strlen(buf) + 1;
 	*bufp = buf;
 	return (0);
+}
 /*
  * prop_array_externalize_to_pref --
  *	Externalize an array into a plistref for sending to the kernel.
  */
 bool
 prop_array_externalize_to_pref(prop_array_t array, struct plistref *prefp)
+{
 	char *buf;
 	int rv;
 	rv = _prop_object_externalize_to_pref(array, prefp, &buf);
 	if (rv != 0)
 		errno = rv;	/* pass up error value in errno */
 	return (rv == 0);
+}
 __strong_alias(prop_array_send_syscall, prop_array_externalize_to_pref)
 /*
  * prop_dictionary_externalize_to_pref --
  *	Externalize an dictionary into a plistref for sending to the kernel.
  */
 bool
 prop_dictionary_externalize_to_pref(prop_dictionary_t dict, struct plistref *prefp)
+{
 	char *buf;
 	int rv;
 	rv = _prop_object_externalize_to_pref(dict, prefp, &buf);
 	if (rv != 0)
 		errno = rv;	/* pass up error value in errno */
 	return (rv == 0);
+}
 __strong_alias(prop_dictionary_send_syscall,
     prop_dictionary_externalize_to_pref)
 static int
 _prop_object_send_ioctl(prop_object_t obj, int fd, unsigned long cmd)
+{
 	struct plistref pref;
 	char *buf;
 	int error;
 	error = _prop_object_externalize_to_pref(obj, &pref, &buf);
 	if (error)
 		return (error);
 	if (ioctl(fd, cmd, &pref) == -1)
 		error = errno;
 	else
 		error = 0;
 	free(buf);
 	return (error);
+}
 /*
  * prop_array_send_ioctl --
  *	Send an array to the kernel using the specified ioctl.
  */
 int
 prop_array_send_ioctl(prop_array_t array, int fd, unsigned long cmd)
+{
 	return (_prop_object_send_ioctl(array, fd, cmd));
+}
 /*
  * prop_dictionary_send_ioctl --
  *	Send a dictionary to the kernel using the specified ioctl.
  */
 int
 prop_dictionary_send_ioctl(prop_dictionary_t dict, int fd, unsigned long cmd)
+{
 	return (_prop_object_send_ioctl(dict, fd, cmd));
+}
 static int
 _prop_object_internalize_from_pref(const struct plistref *pref, prop_type_t type,
 			 prop_object_t *objp)
+{
 	prop_object_t obj = NULL;
 	char *buf;
 	int error = 0;
 	if (pref->pref_len == 0) {
 		/*
 		 * This should never happen; we should always get the XML
 		 * for an empty dictionary if it's really empty.
 		 */
 		error = EIO;
 		goto out;
 	} else {
 		buf = pref->pref_plist;
 		buf[pref->pref_len - 1] = '\0';	/* extra insurance */
 		switch (type) {
 		case PROP_TYPE_DICTIONARY:
 			obj = prop_dictionary_internalize(buf);
 			break;
 		case PROP_TYPE_ARRAY:
 			obj = prop_array_internalize(buf);
 			break;
 		default:
 			error = ENOTSUP;
+		}
 		(void) munmap(buf, pref->pref_len);
 		if (obj == NULL && error == 0)
 			error = EIO;
+	}
  out:
 	if (error == 0)
 		*objp = obj;
 	return (error);
+}
 /*
  * prop_array_recv_ioctl --
  *	Receive an array from the kernel using the specified ioctl.
  */
 int
 prop_array_recv_ioctl(int fd, unsigned long cmd, prop_array_t *arrayp)
+{
 	struct plistref pref;
 	if (ioctl(fd, cmd, &pref) == -1)
 		return (errno);
 	return (_prop_object_internalize_from_pref(&pref, PROP_TYPE_ARRAY,
 					 (prop_object_t *)arrayp));
+}
 /*
  * prop_dictionary_recv_ioctl --
  *	Receive a dictionary from the kernel using the specified ioctl.
  */
 int
 prop_dictionary_recv_ioctl(int fd, unsigned long cmd, prop_dictionary_t *dictp)
+{
 	struct plistref pref;
 	if (ioctl(fd, cmd, &pref) == -1)
 		return (errno);
 	return (_prop_object_internalize_from_pref(&pref, PROP_TYPE_DICTIONARY,
 					 (prop_object_t *)dictp));
+}
 /*
  * prop_array_recv_syscall --
  *	Receive an array from the kernel as pref.
  *	Pref's buf is freed on exit
  */
 bool
 prop_array_recv_syscall(const struct plistref *pref, prop_array_t *arrayp)
+{
 	return (_prop_object_internalize_from_pref(pref, PROP_TYPE_ARRAY,
 					 (prop_object_t *)arrayp));
+}
 /*
  * prop_dictionary_recv_syscall --
  *	Receive a dictionary from the kernel as pref.
  *	Pref's buf is freed on exit
  */
 bool
 prop_dictionary_recv_syscall(const struct plistref *pref,
     prop_dictionary_t *dictp)
+{
 	return (_prop_object_internalize_from_pref(pref, PROP_TYPE_DICTIONARY,
 					 (prop_object_t *)dictp));
+}
 /*
  * prop_dictionary_sendrecv_ioctl --
  *	Combination send/receive a dictionary to/from the kernel using
  *	the specified ioctl.
  */
 int
 prop_dictionary_sendrecv_ioctl(prop_dictionary_t dict, int fd,
 			       unsigned long cmd, prop_dictionary_t *dictp)
+{
 	struct plistref pref;
 	char *buf;
 	int error;
 	error = _prop_object_externalize_to_pref(dict, &pref, &buf);
 	if (error)
 		return (error);
 	if (ioctl(fd, cmd, &pref) == -1)
 		error = errno;
 	else
 		error = 0;
 	free(buf);
 	if (error)
 		return (error);
 	return (_prop_object_internalize_from_pref(&pref, PROP_TYPE_DICTIONARY,
 			    (prop_object_t *)dictp));
+}
 #endif /* !_KERNEL && !_STANDALONE */
 #if defined(_KERNEL)
 #include <sys/param.h>
 #include <sys/mman.h>
 #include <sys/errno.h>
 #include <sys/malloc.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <sys/resource.h>
 #include <sys/pool.h>
 #include <uvm/uvm.h>
 #include "prop_object_impl.h"
 /* Arbitrary limit ioctl input to 64KB */
 unsigned int prop_object_copyin_limit = 65536;
 /* initialize proplib for use in the kernel */
 void
 prop_kern_init(void)
+{
 	__link_set_decl(prop_linkpools, struct prop_pool_init);
 	struct prop_pool_init * const *pi;
 	__link_set_foreach(pi, prop_linkpools)
 		pool_init((*pi)->pp, (*pi)->size, 0, 0, 0, (*pi)->wchan,
 		    &pool_allocator_nointr, IPL_NONE);
+}
 static int
 _prop_object_copyin(const struct plistref *pref, const prop_type_t type,
 			  prop_object_t *objp)
+{
 	prop_object_t obj = NULL;
 	char *buf;
 	int error;
 	/*
 	 * Allocate an extra byte so we can guarantee NUL-termination.
+	 *
 	 * Allow malloc to fail in case pmap would be exhausted.
 	 */
 	buf = malloc(pref->pref_len + 1, M_TEMP, M_WAITOK | M_CANFAIL);
 	if (buf == NULL)
 		return (ENOMEM);
 	error = copyin(pref->pref_plist, buf, pref->pref_len);
 	if (error) {
 		free(buf, M_TEMP);
 		return (error);
+	}
 	buf[pref->pref_len] = '\0';
 	switch (type) {
 	case PROP_TYPE_ARRAY:
 		obj = prop_array_internalize(buf);
 		break;
 	case PROP_TYPE_DICTIONARY:
 		obj = prop_dictionary_internalize(buf);
 		break;
 	default:
 		error = ENOTSUP;
+	}
 	free(buf, M_TEMP);
 	if (obj == NULL) {
 		if (error == 0)
 			error = EIO;
 	} else {
 		*objp = obj;
+	}
 	return (error);
+}
 static int
 _prop_object_copyin_ioctl(const struct plistref *pref, const prop_type_t type,
 			  const u_long cmd, prop_object_t *objp)
+{
 	if ((cmd & IOC_IN) == 0)
 		return (EFAULT);
 	return _prop_object_copyin(pref, type, objp);
+}
 /*
  * prop_array_copyin --
  *	Copy in an array passed as a syscall arg.
  */
 int
 prop_array_copyin(const struct plistref *pref, prop_array_t *arrayp)
+{
 	return (_prop_object_copyin(pref, PROP_TYPE_ARRAY,
 					  (prop_object_t *)arrayp));
+}
 /*
  * prop_dictionary_copyin --
  *	Copy in a dictionary passed as a syscall arg.
  */
 int
 prop_dictionary_copyin(const struct plistref *pref, prop_dictionary_t *dictp)
+{
 	return (_prop_object_copyin(pref, PROP_TYPE_DICTIONARY,
 					  (prop_object_t *)dictp));
+}
 /*
  * prop_array_copyin_ioctl --
  *	Copy in an array send with an ioctl.
  */
 int
 prop_array_copyin_ioctl(const struct plistref *pref, const u_long cmd,
 			prop_array_t *arrayp)
+{
 	return (_prop_object_copyin_ioctl(pref, PROP_TYPE_ARRAY,
 					  cmd, (prop_object_t *)arrayp));
+}
 /*
  * prop_dictionary_copyin_ioctl --
  *	Copy in a dictionary sent with an ioctl.
  */
 int
 prop_dictionary_copyin_ioctl(const struct plistref *pref, const u_long cmd,
 			     prop_dictionary_t *dictp)
+{
 	return (_prop_object_copyin_ioctl(pref, PROP_TYPE_DICTIONARY,
 					  cmd, (prop_object_t *)dictp));
+}
 static int
 _prop_object_copyout(struct plistref *pref, prop_object_t obj)
+{
 	struct lwp *l = curlwp;		/* XXX */
 	struct proc *p = l->l_proc;
 	char *buf;
 	size_t len, rlen;
 	int error = 0;
 	vaddr_t uaddr;
 	switch (prop_object_type(obj)) {
 	case PROP_TYPE_ARRAY:
 		buf = prop_array_externalize(obj);
 		break;
 	case PROP_TYPE_DICTIONARY:
 		buf = prop_dictionary_externalize(obj);
 		break;
 	default:
 		return (ENOTSUP);
+	}
 	if (buf == NULL)
 		return (ENOMEM);
 	len = strlen(buf) + 1;
 	rlen = round_page(len);
 	/*
 	 * See sys_mmap() in sys/uvm/uvm_mmap.c.
 	 * Let's act as if we were calling mmap(0, ...)
 	 */
 	uaddr = p->p_emul->e_vm_default_addr(p,
 	    (vaddr_t)p->p_vmspace->vm_daddr, rlen);
 	error = uvm_mmap(&p->p_vmspace->vm_map,
 			 &uaddr, rlen,
 			 VM_PROT_READ|VM_PROT_WRITE,
 			 VM_PROT_READ|VM_PROT_WRITE,
 			 MAP_PRIVATE|MAP_ANON,
 			 NULL, 0,
 			 p->p_rlimit[RLIMIT_MEMLOCK].rlim_cur);
 	if (error == 0) {
 		error = copyout(buf, (char *)uaddr, len);
 		if (error == 0) {
 			pref->pref_plist = (char *)uaddr;
 			pref->pref_len   = len;
+		}
+	}
 	free(buf, M_TEMP);
 	return (error);
+}
 /*
  * prop_array_copyout --
  *	Copy out an array to a syscall arg.
  */
 int
-prop_array_copyout(struct plistref *pref, prop_array_t *arrayp)
+prop_array_copyout(struct plistref *pref, prop_array_t array)
+{
-	return (_prop_object_copyout(pref, (prop_object_t *)arrayp));
+	return (_prop_object_copyout(pref, array));
+}
 /*
  * prop_dictionary_copyout --
  *	Copy out a dictionary to a syscall arg.
  */
 int
-prop_dictionary_copyout(struct plistref *pref, prop_dictionary_t *dictp)
+prop_dictionary_copyout(struct plistref *pref, prop_dictionary_t dict)
+{
-	return (_prop_object_copyout(pref, (prop_object_t *)dictp));
+	return (_prop_object_copyout(pref, dict));
+}
 static int
 _prop_object_copyout_ioctl(struct plistref *pref, const u_long cmd,
 			   prop_object_t obj)
+{
 	if ((cmd & IOC_OUT) == 0)
 		return (EFAULT);
 	return _prop_object_copyout(pref, obj);
+}
 /*
  * prop_array_copyout_ioctl --
  *	Copy out an array being received with an ioctl.
  */
 int
 prop_array_copyout_ioctl(struct plistref *pref, const u_long cmd,
 			 prop_array_t array)
+{
 	return (_prop_object_copyout_ioctl(pref, cmd, array));
+}
 /*
  * prop_dictionary_copyout_ioctl --
  *	Copy out a dictionary being received with an ioctl.
  */
 int
 prop_dictionary_copyout_ioctl(struct plistref *pref, const u_long cmd,
 			      prop_dictionary_t dict)
+{
 	return (
 	    _prop_object_copyout_ioctl(pref, cmd, dict));
+}
 #endif /* _KERNEL */
 #endif /* __NetBSD__ */