Thu Jan 20 11:17:59 2011 UTC ()
prop_*_copyout takes an object as second parameter, not a pointer to object.
(bouyer)
diff -r1.10 -r1.11 src/common/include/prop/prop_array.h
diff -r1.11 -r1.12 src/common/include/prop/prop_dictionary.h
diff -r1.15 -r1.16 src/common/lib/libprop/prop_kern.c
--- src/common/include/prop/prop_array.h 2011/01/19 20:34:23 1.10
+++ src/common/include/prop/prop_array.h 2011/01/20 11:17:58 1.11
@@ -1,4 +1,4 @@
-/* $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.
@@ -77,7 +77,7 @@
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,
--- src/common/include/prop/prop_dictionary.h 2011/01/19 20:34:23 1.11
+++ src/common/include/prop/prop_dictionary.h 2011/01/20 11:17:58 1.12
@@ -1,4 +1,4 @@
-/* $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.
@@ -101,7 +101,7 @@
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 *);
--- src/common/lib/libprop/prop_kern.c 2011/01/19 20:34:23 1.15
+++ src/common/lib/libprop/prop_kern.c 2011/01/20 11:17:58 1.16
@@ -1,4 +1,4 @@
-/* $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.
@@ -471,9 +471,9 @@
* 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));
}
/*
@@ -481,9 +481,9 @@
* 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