From e17f02568a11d47c3baa8e505edf5be280c7b6bc Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Mon, 23 Jul 2001 04:31:41 +0000 Subject: [PATCH] Misc cleanup --- include/disptmpl.h | 2 ++ include/ldap_utf8.h | 43 +++++++++++++++++++++++-------------------- include/srchpref.h | 1 + 3 files changed, 26 insertions(+), 20 deletions(-) diff --git a/include/disptmpl.h b/include/disptmpl.h index e59e87de86..c5a858c727 100644 --- a/include/disptmpl.h +++ b/include/disptmpl.h @@ -24,6 +24,8 @@ * 7 March 1994 by Mark C Smith */ +/* DEPRECATED DEPRECATED DEPRECATED DEPRECATED DEPRECATED */ + #ifndef _DISPTMPL_H #define _DISPTMPL_H diff --git a/include/ldap_utf8.h b/include/ldap_utf8.h index c5cc61e109..ac1a1417cf 100644 --- a/include/ldap_utf8.h +++ b/include/ldap_utf8.h @@ -54,44 +54,47 @@ LDAP_F( int ) ldap_x_ucs4_to_utf8( ldap_ucs4_t c, char *buf ); */ /* UTF-8 character to Wide Char */ -LDAP_F(int) -ldap_x_utf8_to_wc LDAP_P(( wchar_t *wchar, LDAP_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 LDAP_P(( wchar_t *wcstr, LDAP_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 LDAP_P(( 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 LDAP_P(( char *utf8str, LDAP_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 LDAP_P(( char *mbchar, LDAP_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 LDAP_P(( char *mbstr, LDAP_CONST char *utf8str, size_t count, - size_t (*f_wcstombs)(char *mbstr, LDAP_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 LDAP_P(( char *utf8char, LDAP_CONST char *mbchar, size_t mbsize, - int (*f_mbtowc)(wchar_t *wchar, LDAP_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 LDAP_P(( char *utf8str, LDAP_CONST char *mbstr, size_t count, - size_t (*f_mbstowcs)(wchar_t *wcstr, LDAP_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 diff --git a/include/srchpref.h b/include/srchpref.h index 80a2943a06..f711bb4dc3 100644 --- a/include/srchpref.h +++ b/include/srchpref.h @@ -24,6 +24,7 @@ * 16 May 1994 by Gordon Good */ +/* DEPRECATED DEPRECATED DEPRECATED DEPRECATED DEPRECATED */ #ifndef _SRCHPREF_H #define _SRCHPREF_H -- 2.39.5