Module Name: src
Committed By: bad
Date: Sat Oct 10 21:26:16 UTC 2009
Modified Files:
src/common/include/prop: prop_array.h prop_dictionary.h
Log Message:
Commit changes to header files missed in my previous commit.
Implement prop_array_externalize_to_pref(), prop_array_copyin(),
prop_dictionary_externalize_to_pref() and prop_dictionary_copyin()
as discussed in the thread:
http://mail-index.netbsd.org/tech-kern/2009/07/29/msg005594.html
Add prototypes for prop_array_externalize_to_pref() and
prop_dictionary_externalize_to_pref().
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/common/include/prop/prop_array.h
cvs rdiff -u -r1.9 -r1.10 src/common/include/prop/prop_dictionary.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/common/include/prop/prop_array.h
diff -u src/common/include/prop/prop_array.h:1.8 src/common/include/prop/prop_array.h:1.9
--- src/common/include/prop/prop_array.h:1.8 Thu Sep 11 13:15:13 2008
+++ src/common/include/prop/prop_array.h Sat Oct 10 21:26:16 2009
@@ -1,7 +1,7 @@
-/* $NetBSD: prop_array.h,v 1.8 2008/09/11 13:15:13 haad Exp $ */
+/* $NetBSD: prop_array.h,v 1.9 2009/10/10 21:26:16 bad Exp $ */
/*-
- * Copyright (c) 2006 The NetBSD Foundation, Inc.
+ * Copyright (c) 2006, 2009 The NetBSD Foundation, Inc.
* All rights reserved.
*
* This code is derived from software contributed to The NetBSD Foundation
@@ -66,12 +66,14 @@
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 *);
#elif defined(_KERNEL)
-struct plistref;
-
+int prop_array_copyin(const 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,
Index: src/common/include/prop/prop_dictionary.h
diff -u src/common/include/prop/prop_dictionary.h:1.9 src/common/include/prop/prop_dictionary.h:1.10
--- src/common/include/prop/prop_dictionary.h:1.9 Mon Apr 28 20:22:51 2008
+++ src/common/include/prop/prop_dictionary.h Sat Oct 10 21:26:16 2009
@@ -1,7 +1,7 @@
-/* $NetBSD: prop_dictionary.h,v 1.9 2008/04/28 20:22:51 martin Exp $ */
+/* $NetBSD: prop_dictionary.h,v 1.10 2009/10/10 21:26:16 bad Exp $ */
/*-
- * Copyright (c) 2006 The NetBSD Foundation, Inc.
+ * Copyright (c) 2006, 2009 The NetBSD Foundation, Inc.
* All rights reserved.
*
* This code is derived from software contributed to The NetBSD Foundation
@@ -82,7 +82,10 @@
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,
@@ -91,8 +94,8 @@
int, unsigned long,
prop_dictionary_t *);
#elif defined(_KERNEL)
-struct plistref;
-
+int prop_dictionary_copyin(const struct plistref *,
+ prop_dictionary_t *);
int prop_dictionary_copyin_ioctl(const struct plistref *,
const u_long,
prop_dictionary_t *);
