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 f3f2bfaccd3eda614f0706a11a6854d2037b938b..1feafbf5b9070fc4bdeb8204557ec3c99d0f9d26 100644 (file)
--- a/bsd/sys/utfconv.h
+++ b/bsd/sys/utfconv.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2002 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
@@ -23,24 +23,33 @@
 #ifndef _SYS_UTFCONV_H_
 #define        _SYS_UTFCONV_H_
 
+#include <sys/appleapiopts.h>
+#include <sys/cdefs.h> 
+
 #ifdef KERNEL
+#ifdef __APPLE_API_UNSTABLE
 /*
  * UTF-8 encode/decode flags
  */
 #define        UTF_REVERSE_ENDIAN      0x01    /* reverse UCS-2 byte order */
 #define UTF_NO_NULL_TERM       0x02    /* do not add null termination */
-#define        UTF_DECOMPOSED          0x04    /* generate fully decompsed UCS-2 */
+#define        UTF_DECOMPOSED          0x04    /* generate fully decomposed UCS-2 */
+#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 */
 #endif /* KERNEL */
 
 #endif /* !_SYS_UTFCONV_H_ */