X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=include%2Fldap_utf8.h;h=d9cdc8f214f6958d9a8d2cd2089575381412467d;hb=53d6d3c95755e16b1b9240c1fd928bb6fc8deab1;hp=c65756353bff0ca95c06d99b4963418169983433;hpb=be9a50af258c16083245db489aca5676c429f606;p=openldap

diff --git a/include/ldap_utf8.h b/include/ldap_utf8.h
index c65756353b..d9cdc8f214 100644
--- a/include/ldap_utf8.h
+++ b/include/ldap_utf8.h
@@ -1,17 +1,18 @@
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2001 The OpenLDAP Foundation, Redwood City, California, USA
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2007 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted only as authorized by the OpenLDAP
- * Public License.  A copy of this license is available at
- * http://www.OpenLDAP.org/license.html or in file LICENSE in the
- * top-level directory of the distribution.
+ * Public License.
+ *
+ * A copy of this license is available in file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
-/* $Novell: /ldap/src/cldap/include/ldap_utf8.h,v 1.3 2000/12/04 20:23:20 dsteck Exp $ 
-/******************************************************************************
- * This notice applies to changes, created by or for Novell, Inc.,
+/* This notice applies to changes, created by or for Novell, Inc.,
  * to preexisting works for which notices appear elsewhere in this file.
  *
  * Copyright (C) 2000 Novell, Inc. All Rights Reserved.
@@ -23,66 +24,82 @@
  * TOP-LEVEL DIRECTORY OF THE DISTRIBUTION. ANY USE OR EXPLOITATION OF THIS
  * WORK OTHER THAN AS AUTHORIZED IN VERSION 2.0.1 OF THE OPENLDAP PUBLIC
  * LICENSE, OR OTHER PRIOR WRITTEN CONSENT FROM NOVELL, COULD SUBJECT THE
- * PERPETRATOR TO CRIMINAL AND CIVIL LIABILITY. 
- ******************************************************************************/
+ * PERPETRATOR TO CRIMINAL AND CIVIL LIABILITY.
+ */
+/* Note: A verbatim copy of version 2.0.1 of the OpenLDAP Public License
+ * can be found in the file "build/LICENSE-2.0.1" in this distribution
+ * of OpenLDAP Software.
+ */
 
 #ifndef _LDAP_UTF8_H
 #define _LDAP_UTF8_H
 
-LDAP_BEGIN_DECL
+#include <lber_types.h>	/* get ber_*_t */
 
-/*  
+/*
  * UTF-8 Utility Routines
  */
 
+LDAP_BEGIN_DECL
+
 #define LDAP_UCS4_INVALID (0x80000000U)
+typedef ber_int_t ldap_ucs4_t;
+
 
 /* LDAP_MAX_UTF8_LEN is 3 or 6 depending on size of wchar_t */
 #define LDAP_MAX_UTF8_LEN  ( sizeof(wchar_t) * 3/2 )
 
+/* Unicode conversion routines  */
+LDAP_F( ldap_ucs4_t ) ldap_x_utf8_to_ucs4( LDAP_CONST char * p );
+LDAP_F( int ) ldap_x_ucs4_to_utf8( ldap_ucs4_t c, char *buf );
+
+
 /*
  * Wide Char / UTF-8 Conversion Routines
  */
 
 /* UTF-8 character to Wide Char */
-LDAP_F(int)
-ldap_x_utf8_to_wc ( wchar_t *wchar, const char *utf8char );
+LDAP_F(int) ldap_x_utf8_to_wc LDAP_P((
+	wchar_t *wchar, LDAP_CONST char *utf8char ));
 
 /* UTF-8 string to Wide Char string */
-LDAP_F(int)
-ldap_x_utf8s_to_wcs ( wchar_t *wcstr, const char *utf8str, size_t count );
+LDAP_F(int) ldap_x_utf8s_to_wcs LDAP_P((
+	wchar_t *wcstr, LDAP_CONST char *utf8str, size_t count ));
 
 /* Wide Char to UTF-8 character */
-LDAP_F(int)
-ldap_x_wc_to_utf8 ( char *utf8char, wchar_t wchar, size_t count );
+LDAP_F(int) ldap_x_wc_to_utf8 LDAP_P((
+	char *utf8char, wchar_t wchar, size_t count ));
 
 /* Wide Char string to UTF-8 string */
-LDAP_F(int)
-ldap_x_wcs_to_utf8s ( char *utf8str, const wchar_t *wcstr, size_t count );
+LDAP_F(int) ldap_x_wcs_to_utf8s LDAP_P((
+	char *utf8str, LDAP_CONST wchar_t *wcstr, size_t count ));
 
 /*
  * MultiByte Char / UTF-8 Conversion Routines
  */
 
 /* UTF-8 character to MultiByte character */
-LDAP_F(int)
-ldap_x_utf8_to_mb ( char *mbchar, const char *utf8char,
-		int (*f_wctomb)(char *mbchar, wchar_t wchar) );
+LDAP_F(int) ldap_x_utf8_to_mb LDAP_P((
+	char *mbchar, LDAP_CONST char *utf8char,
+	int (*ldap_f_wctomb)( char *mbchar, wchar_t wchar )));
 
 /* UTF-8 string to MultiByte string */
-LDAP_F(int)
-ldap_x_utf8s_to_mbs ( char *mbstr, const char *utf8str, size_t count,
-		size_t (*f_wcstombs)(char *mbstr, const wchar_t *wcstr, size_t count) );
+LDAP_F(int) ldap_x_utf8s_to_mbs LDAP_P((
+	char *mbstr, LDAP_CONST char *utf8str, size_t count,
+	size_t (*ldap_f_wcstombs)( char *mbstr,
+		LDAP_CONST wchar_t *wcstr, size_t count) ));
 
 /* MultiByte character to UTF-8 character */
-LDAP_F(int)
-ldap_x_mb_to_utf8 ( char *utf8char, const char *mbchar, size_t mbsize,
-		int (*f_mbtowc)(wchar_t *wchar, const char *mbchar, size_t count) );
+LDAP_F(int) ldap_x_mb_to_utf8 LDAP_P((
+	char *utf8char, LDAP_CONST char *mbchar, size_t mbsize,
+	int (*ldap_f_mbtowc)( wchar_t *wchar,
+		LDAP_CONST char *mbchar, size_t count) ));
 
 /* MultiByte string to UTF-8 string */
-LDAP_F(int)
-ldap_x_mbs_to_utf8s ( char *utf8str, const char *mbstr, size_t count,
-		size_t (*f_mbstowcs)(wchar_t *wcstr, const char *mbstr, size_t count) );
+LDAP_F(int) ldap_x_mbs_to_utf8s LDAP_P((
+	char *utf8str, LDAP_CONST char *mbstr, size_t count,
+	size_t (*ldap_f_mbstowcs)( wchar_t *wcstr,
+		LDAP_CONST char *mbstr, size_t count) ));
 
 LDAP_END_DECL