xnu-792.6.76.tar.gz

[apple/xnu.git] / bsd / sys / utfconv.h

diff --git a/bsd/sys/utfconv.h b/bsd/sys/utfconv.h
index 9c0a4af89d5d0a497fc6b3032f23384b2cb61888..1feafbf5b9070fc4bdeb8204557ec3c99d0f9d26 100644 (file)
--- a/bsd/sys/utfconv.h
+++ b/bsd/sys/utfconv.h
@@ -3,22 +3,19 @@
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
  * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
@@ -27,6 +24,7 @@
 #define        _SYS_UTFCONV_H_
 
 #include <sys/appleapiopts.h>
+#include <sys/cdefs.h> 
 
 #ifdef KERNEL
 #ifdef __APPLE_API_UNSTABLE
@@ -39,13 +37,16 @@
 #define        UTF_PRECOMPOSED         0x08    /* generate precomposed UCS-2 */
 
 __BEGIN_DECLS
-size_t utf8_encodelen __P((const u_int16_t *, size_t, u_int16_t, int));
+size_t utf8_encodelen(const u_int16_t *, size_t, u_int16_t, int);
+
+int    utf8_encodestr(const u_int16_t *, size_t, u_int8_t *, size_t *,
+               size_t, u_int16_t, int);
+
+int    utf8_decodestr(const u_int8_t *, size_t, u_int16_t *,size_t *,
+               size_t, u_int16_t, int);
 
-int    utf8_encodestr __P((const u_int16_t *, size_t, u_int8_t *, size_t *,
-               size_t, u_int16_t, int));
+int    utf8_validatestr(const u_int8_t*, size_t);
 
-int    utf8_decodestr __P((const u_int8_t *, size_t, u_int16_t *,size_t *,
-               size_t, u_int16_t, int));
 __END_DECLS
 
 #endif /* __APPLE_API_UNSTABLE */