system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-01 17:23:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

wldap32: Make the wrap_*() functions static.

Browse source 
Signed-off-by: Francois Gouget <fgouget@free.fr>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Francois Gouget 2021-08-26 14:51:18 +02:00 committed by Alexandre Julliard
parent 87a42df9f7
commit efdd07ae3d
2 changed files with 63 additions and 145 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

126
dlls/wldap32/libldap.c
View file

@ -61,22 +61,22 @@ static LDAPMod *nullmods[] = { NULL };
static const struct ldap_callbacks *callbacks; static const struct ldap_callbacks *callbacks;
void * CDECL wrap_ber_alloc_t( int options ) static void * CDECL wrap_ber_alloc_t( int options )
{ {
return ber_alloc_t( options ); return ber_alloc_t( options );
} }
void CDECL wrap_ber_bvecfree( struct bervalU **berval ) static void CDECL wrap_ber_bvecfree( struct bervalU **berval )
{ {
ber_bvecfree( (struct berval **)berval ); ber_bvecfree( (struct berval **)berval );
} }
void CDECL wrap_ber_bvfree( struct bervalU *berval ) static void CDECL wrap_ber_bvfree( struct bervalU *berval )
{ {
ber_bvfree( (struct berval *)berval ); ber_bvfree( (struct berval *)berval );
} }
unsigned int CDECL wrap_ber_first_element( void *ber, ULONG *ret_len, char **last ) static unsigned int CDECL wrap_ber_first_element( void *ber, ULONG *ret_len, char **last )
{ {
ber_len_t len; ber_len_t len;
ber_tag_t ret; ber_tag_t ret;
@ -97,22 +97,22 @@ unsigned int CDECL wrap_ber_first_element( void *ber, ULONG *ret_len, char **las
return ret; return ret;
} }
int CDECL wrap_ber_flatten( void *ber, struct bervalU **berval ) static int CDECL wrap_ber_flatten( void *ber, struct bervalU **berval )
{ {
return ber_flatten( ber, (struct berval **)berval ); return ber_flatten( ber, (struct berval **)berval );
} }
void CDECL wrap_ber_free( void *ber, int freebuf ) static void CDECL wrap_ber_free( void *ber, int freebuf )
{ {
ber_free( ber, freebuf ); ber_free( ber, freebuf );
} }
void * CDECL wrap_ber_init( struct bervalU *berval ) static void * CDECL wrap_ber_init( struct bervalU *berval )
{ {
return ber_init( (struct berval *)berval ); return ber_init( (struct berval *)berval );
} }
unsigned int CDECL wrap_ber_next_element( void *ber, unsigned int *ret_len, char *last ) static unsigned int CDECL wrap_ber_next_element( void *ber, unsigned int *ret_len, char *last )
{ {
ber_len_t len; ber_len_t len;
ber_tag_t ret; ber_tag_t ret;
@ -133,7 +133,7 @@ unsigned int CDECL wrap_ber_next_element( void *ber, unsigned int *ret_len, char
return ret; return ret;
} }
unsigned int CDECL wrap_ber_peek_tag( void *ber, unsigned int *ret_len ) static unsigned int CDECL wrap_ber_peek_tag( void *ber, unsigned int *ret_len )
{ {
ber_len_t len; ber_len_t len;
ber_tag_t ret; ber_tag_t ret;
@ -149,7 +149,7 @@ unsigned int CDECL wrap_ber_peek_tag( void *ber, unsigned int *ret_len )
return ret; return ret;
} }
unsigned int CDECL wrap_ber_skip_tag( void *ber, unsigned int *ret_len ) static unsigned int CDECL wrap_ber_skip_tag( void *ber, unsigned int *ret_len )
{ {
ber_len_t len; ber_len_t len;
ber_tag_t ret; ber_tag_t ret;
@ -165,7 +165,7 @@ unsigned int CDECL wrap_ber_skip_tag( void *ber, unsigned int *ret_len )
return ret; return ret;
} }
int WINAPIV wrap_ber_printf( void *ber, char *fmt, ... ) static int WINAPIV wrap_ber_printf( void *ber, char *fmt, ... )
{ {
int ret; int ret;
__ms_va_list args; __ms_va_list args;
@ -230,7 +230,7 @@ int WINAPIV wrap_ber_printf( void *ber, char *fmt, ... )
return ret; return ret;
} }
int WINAPIV wrap_ber_scanf( void *ber, char *fmt, ... ) static int WINAPIV wrap_ber_scanf( void *ber, char *fmt, ... )
{ {
int ret; int ret;
__ms_va_list args; __ms_va_list args;
@ -301,12 +301,12 @@ int WINAPIV wrap_ber_scanf( void *ber, char *fmt, ... )
return ret; return ret;
} }
int CDECL wrap_ldap_abandon_ext( void *ld, int msgid, LDAPControlU **serverctrls, LDAPControlU **clientctrls ) static int CDECL wrap_ldap_abandon_ext( void *ld, int msgid, LDAPControlU **serverctrls, LDAPControlU **clientctrls )
{ {
return ldap_abandon_ext( ld, msgid, (LDAPControl **)serverctrls, (LDAPControl **)clientctrls ); return ldap_abandon_ext( ld, msgid, (LDAPControl **)serverctrls, (LDAPControl **)clientctrls );
} }
int CDECL wrap_ldap_add_ext( void *ld, const char *dn, LDAPModU **attrs, LDAPControlU **serverctrls, static int CDECL wrap_ldap_add_ext( void *ld, const char *dn, LDAPModU **attrs, LDAPControlU **serverctrls,
LDAPControlU **clientctrls, ULONG *msg ) LDAPControlU **clientctrls, ULONG *msg )
{ {
int dummy; int dummy;
@ -314,14 +314,14 @@ int CDECL wrap_ldap_add_ext( void *ld, const char *dn, LDAPModU **attrs, LDAPCon
(LDAPControl **)clientctrls, msg ? (int *)msg : &dummy ); (LDAPControl **)clientctrls, msg ? (int *)msg : &dummy );
} }
int CDECL wrap_ldap_add_ext_s( void *ld, const char *dn, LDAPModU **attrs, LDAPControlU **serverctrls, static int CDECL wrap_ldap_add_ext_s( void *ld, const char *dn, LDAPModU **attrs, LDAPControlU **serverctrls,
LDAPControlU **clientctrls ) LDAPControlU **clientctrls )
{ {
return ldap_add_ext_s( ld, dn ? dn : "", attrs ? (LDAPMod **)attrs : nullmods, (LDAPControl **)serverctrls, return ldap_add_ext_s( ld, dn ? dn : "", attrs ? (LDAPMod **)attrs : nullmods, (LDAPControl **)serverctrls,
(LDAPControl **)clientctrls ); (LDAPControl **)clientctrls );
} }
int CDECL wrap_ldap_compare_ext( void *ld, const char *dn, const char *attrs, struct bervalU *value, static int CDECL wrap_ldap_compare_ext( void *ld, const char *dn, const char *attrs, struct bervalU *value,
LDAPControlU **serverctrls, LDAPControlU **clientctrls, ULONG *msg ) LDAPControlU **serverctrls, LDAPControlU **clientctrls, ULONG *msg )
{ {
int dummy; int dummy;
@ -329,49 +329,49 @@ int CDECL wrap_ldap_compare_ext( void *ld, const char *dn, const char *attrs, st
(LDAPControl **)serverctrls, (LDAPControl **)clientctrls, msg ? (int *)msg : &dummy ); (LDAPControl **)serverctrls, (LDAPControl **)clientctrls, msg ? (int *)msg : &dummy );
} }
int CDECL wrap_ldap_compare_ext_s( void *ld, const char *dn, const char *attrs, struct bervalU *value, static int CDECL wrap_ldap_compare_ext_s( void *ld, const char *dn, const char *attrs, struct bervalU *value,
LDAPControlU **serverctrls, LDAPControlU **clientctrls ) LDAPControlU **serverctrls, LDAPControlU **clientctrls )
{ {
return ldap_compare_ext_s( ld, dn ? dn : "", attrs ? attrs : "", (struct berval *)value, return ldap_compare_ext_s( ld, dn ? dn : "", attrs ? attrs : "", (struct berval *)value,
(LDAPControl **)serverctrls, (LDAPControl **)clientctrls ); (LDAPControl **)serverctrls, (LDAPControl **)clientctrls );
} }
void CDECL wrap_ldap_control_free( LDAPControlU *control ) static void CDECL wrap_ldap_control_free( LDAPControlU *control )
{ {
ldap_control_free( (LDAPControl *)control ); ldap_control_free( (LDAPControl *)control );
} }
void CDECL wrap_ldap_controls_free( LDAPControlU **control ) static void CDECL wrap_ldap_controls_free( LDAPControlU **control )
{ {
ldap_controls_free( (LDAPControl **)control ); ldap_controls_free( (LDAPControl **)control );
} }
int CDECL wrap_ldap_count_entries( void *ld, void *chain ) static int CDECL wrap_ldap_count_entries( void *ld, void *chain )
{ {
return ldap_count_entries( ld, chain ); return ldap_count_entries( ld, chain );
} }
int CDECL wrap_ldap_count_references( void *ld, void *chain ) static int CDECL wrap_ldap_count_references( void *ld, void *chain )
{ {
return ldap_count_references( ld, chain ); return ldap_count_references( ld, chain );
} }
int CDECL wrap_ldap_count_values_len( struct bervalU **values ) static int CDECL wrap_ldap_count_values_len( struct bervalU **values )
{ {
return ldap_count_values_len( (struct berval **)values ); return ldap_count_values_len( (struct berval **)values );
} }
int CDECL wrap_ldap_create_sort_control( void *ld, LDAPSortKeyU **keylist, int critical, LDAPControlU **control ) static int CDECL wrap_ldap_create_sort_control( void *ld, LDAPSortKeyU **keylist, int critical, LDAPControlU **control )
{ {
return ldap_create_sort_control( ld, (LDAPSortKey **)keylist, critical, (LDAPControl **)control ); return ldap_create_sort_control( ld, (LDAPSortKey **)keylist, critical, (LDAPControl **)control );
} }
int CDECL wrap_ldap_create_vlv_control( void *ld, LDAPVLVInfoU *info, LDAPControlU **control ) static int CDECL wrap_ldap_create_vlv_control( void *ld, LDAPVLVInfoU *info, LDAPControlU **control )
{ {
return ldap_create_vlv_control( ld, (LDAPVLVInfo *)info, (LDAPControl **)control ); return ldap_create_vlv_control( ld, (LDAPVLVInfo *)info, (LDAPControl **)control );
} }
int CDECL wrap_ldap_delete_ext( void *ld, const char *dn, LDAPControlU **serverctrls, LDAPControlU **clientctrls, static int CDECL wrap_ldap_delete_ext( void *ld, const char *dn, LDAPControlU **serverctrls, LDAPControlU **clientctrls,
ULONG *msg ) ULONG *msg )
{ {
int dummy; int dummy;
@ -379,22 +379,22 @@ int CDECL wrap_ldap_delete_ext( void *ld, const char *dn, LDAPControlU **serverc
msg ? (int *)msg : &dummy ); msg ? (int *)msg : &dummy );
} }
int CDECL wrap_ldap_delete_ext_s( void *ld, const char *dn, LDAPControlU **serverctrls, LDAPControlU **clientctrls ) static int CDECL wrap_ldap_delete_ext_s( void *ld, const char *dn, LDAPControlU **serverctrls, LDAPControlU **clientctrls )
{ {
return ldap_delete_ext_s( ld, dn ? dn : "", (LDAPControl **)serverctrls, (LDAPControl **)clientctrls ); return ldap_delete_ext_s( ld, dn ? dn : "", (LDAPControl **)serverctrls, (LDAPControl **)clientctrls );
} }
char * CDECL wrap_ldap_dn2ufn( const char *dn ) static char * CDECL wrap_ldap_dn2ufn( const char *dn )
{ {
return ldap_dn2ufn( dn ); return ldap_dn2ufn( dn );
} }
char ** CDECL wrap_ldap_explode_dn( const char *dn, int notypes ) static char ** CDECL wrap_ldap_explode_dn( const char *dn, int notypes )
{ {
return ldap_explode_dn( dn, notypes ); return ldap_explode_dn( dn, notypes );
} }
int CDECL wrap_ldap_extended_operation( void *ld, const char *oid, struct bervalU *data, LDAPControlU **serverctrls, static int CDECL wrap_ldap_extended_operation( void *ld, const char *oid, struct bervalU *data, LDAPControlU **serverctrls,
LDAPControlU **clientctrls, ULONG *msg ) LDAPControlU **clientctrls, ULONG *msg )
{ {
int dummy; int dummy;
@ -402,59 +402,59 @@ int CDECL wrap_ldap_extended_operation( void *ld, const char *oid, struct berval
(LDAPControl **)clientctrls, msg ? (int *)msg : &dummy ); (LDAPControl **)clientctrls, msg ? (int *)msg : &dummy );
} }
int CDECL wrap_ldap_extended_operation_s( void *ld, const char *oid, struct bervalU *data, LDAPControlU **serverctrls, static int CDECL wrap_ldap_extended_operation_s( void *ld, const char *oid, struct bervalU *data, LDAPControlU **serverctrls,
LDAPControlU **clientctrls, char **retoid, struct bervalU **retdata ) LDAPControlU **clientctrls, char **retoid, struct bervalU **retdata )
{ {
return ldap_extended_operation_s( ld, oid ? oid : "", (struct berval *)data, (LDAPControl **)serverctrls, return ldap_extended_operation_s( ld, oid ? oid : "", (struct berval *)data, (LDAPControl **)serverctrls,
(LDAPControl **)clientctrls, retoid, (struct berval **)retdata ); (LDAPControl **)clientctrls, retoid, (struct berval **)retdata );
} }
char * CDECL wrap_ldap_get_dn( void *ld, void *entry ) static char * CDECL wrap_ldap_get_dn( void *ld, void *entry )
{ {
return ldap_get_dn( ld, entry ); return ldap_get_dn( ld, entry );
} }
char * CDECL wrap_ldap_first_attribute( void *ld, void *entry, void **ber ) static char * CDECL wrap_ldap_first_attribute( void *ld, void *entry, void **ber )
{ {
return ldap_first_attribute( ld, entry, (BerElement **)ber ); return ldap_first_attribute( ld, entry, (BerElement **)ber );
} }
void * CDECL wrap_ldap_first_entry( void *ld, void *chain ) static void * CDECL wrap_ldap_first_entry( void *ld, void *chain )
{ {
return ldap_first_entry( ld, chain ); return ldap_first_entry( ld, chain );
} }
void * CDECL wrap_ldap_first_reference( void *ld, void *chain ) static void * CDECL wrap_ldap_first_reference( void *ld, void *chain )
{ {
return ldap_first_reference( ld, chain ); return ldap_first_reference( ld, chain );
} }
int CDECL wrap_ldap_get_option( void *ld, int option, void *value ) static int CDECL wrap_ldap_get_option( void *ld, int option, void *value )
{ {
return ldap_get_option( ld, option, value ); return ldap_get_option( ld, option, value );
} }
struct bervalU ** CDECL wrap_ldap_get_values_len( void *ld, void *entry, const char *attr ) static struct bervalU ** CDECL wrap_ldap_get_values_len( void *ld, void *entry, const char *attr )
{ {
return (struct bervalU **)ldap_get_values_len( ld, entry, attr ); return (struct bervalU **)ldap_get_values_len( ld, entry, attr );
} }
int CDECL wrap_ldap_initialize( void **ld, const char *url ) static int CDECL wrap_ldap_initialize( void **ld, const char *url )
{ {
return ldap_initialize( (LDAP **)ld, url ); return ldap_initialize( (LDAP **)ld, url );
} }
void CDECL wrap_ldap_memfree( void *ptr ) static void CDECL wrap_ldap_memfree( void *ptr )
{ {
return ldap_memfree( ptr ); return ldap_memfree( ptr );
} }
void CDECL wrap_ldap_memvfree( void **ptr ) static void CDECL wrap_ldap_memvfree( void **ptr )
{ {
ldap_memvfree( ptr ); ldap_memvfree( ptr );
} }
int CDECL wrap_ldap_modify_ext( void *ld, const char *dn, LDAPModU **mods, LDAPControlU **serverctrls, static int CDECL wrap_ldap_modify_ext( void *ld, const char *dn, LDAPModU **mods, LDAPControlU **serverctrls,
LDAPControlU **clientctrls, ULONG *msg ) LDAPControlU **clientctrls, ULONG *msg )
{ {
int dummy; int dummy;
@ -462,88 +462,88 @@ int CDECL wrap_ldap_modify_ext( void *ld, const char *dn, LDAPModU **mods, LDAPC
(LDAPControl **)clientctrls, msg ? (int *)msg : &dummy ); (LDAPControl **)clientctrls, msg ? (int *)msg : &dummy );
} }
int CDECL wrap_ldap_modify_ext_s( void *ld, const char *dn, LDAPModU **mods, LDAPControlU **serverctrls, static int CDECL wrap_ldap_modify_ext_s( void *ld, const char *dn, LDAPModU **mods, LDAPControlU **serverctrls,
LDAPControlU **clientctrls ) LDAPControlU **clientctrls )
{ {
return ldap_modify_ext_s( ld, dn ? dn : "", mods ? (LDAPMod **)mods : nullmods, (LDAPControl **)serverctrls, return ldap_modify_ext_s( ld, dn ? dn : "", mods ? (LDAPMod **)mods : nullmods, (LDAPControl **)serverctrls,
(LDAPControl **)clientctrls ); (LDAPControl **)clientctrls );
} }
int CDECL wrap_ldap_msgfree( void *msg ) static int CDECL wrap_ldap_msgfree( void *msg )
{ {
return ldap_msgfree( msg ); return ldap_msgfree( msg );
} }
char * CDECL wrap_ldap_next_attribute( void *ld, void *entry, void *ber ) static char * CDECL wrap_ldap_next_attribute( void *ld, void *entry, void *ber )
{ {
return ldap_next_attribute( ld, entry, ber ); return ldap_next_attribute( ld, entry, ber );
} }
void * CDECL wrap_ldap_next_entry( void *ld, void *entry ) static void * CDECL wrap_ldap_next_entry( void *ld, void *entry )
{ {
return ldap_next_entry( ld, entry ); return ldap_next_entry( ld, entry );
} }
void * CDECL wrap_ldap_next_reference( void *ld, void *entry ) static void * CDECL wrap_ldap_next_reference( void *ld, void *entry )
{ {
return ldap_next_reference( ld, entry ); return ldap_next_reference( ld, entry );
} }
int CDECL wrap_ldap_parse_extended_result( void *ld, void *result, char **retoid, struct bervalU **retdata, int free ) static int CDECL wrap_ldap_parse_extended_result( void *ld, void *result, char **retoid, struct bervalU **retdata, int free )
{ {
return ldap_parse_extended_result( ld, result, retoid, (struct berval **)retdata, free ); return ldap_parse_extended_result( ld, result, retoid, (struct berval **)retdata, free );
} }
int CDECL wrap_ldap_parse_reference( void *ld, void *ref, char ***referrals, LDAPControlU ***serverctrls, int free ) static int CDECL wrap_ldap_parse_reference( void *ld, void *ref, char ***referrals, LDAPControlU ***serverctrls, int free )
{ {
return ldap_parse_reference( ld, ref, referrals, (LDAPControl ***)serverctrls, free ); return ldap_parse_reference( ld, ref, referrals, (LDAPControl ***)serverctrls, free );
} }
int CDECL wrap_ldap_parse_result( void *ld, void *res, int *errcode, char **matcheddn, char **errmsg, static int CDECL wrap_ldap_parse_result( void *ld, void *res, int *errcode, char **matcheddn, char **errmsg,
char ***referrals, LDAPControlU ***serverctrls, int free ) char ***referrals, LDAPControlU ***serverctrls, int free )
{ {
return ldap_parse_result( ld, res, errcode, matcheddn, errmsg, referrals, (LDAPControl ***)serverctrls, free ); return ldap_parse_result( ld, res, errcode, matcheddn, errmsg, referrals, (LDAPControl ***)serverctrls, free );
} }
int CDECL wrap_ldap_parse_sortresponse_control( void *ld, LDAPControlU *ctrl, int *result, char **attr ) static int CDECL wrap_ldap_parse_sortresponse_control( void *ld, LDAPControlU *ctrl, int *result, char **attr )
{ {
return ldap_parse_sortresponse_control( ld, (LDAPControl *)ctrl, result, attr ); return ldap_parse_sortresponse_control( ld, (LDAPControl *)ctrl, result, attr );
} }
int CDECL wrap_ldap_parse_vlvresponse_control( void *ld, LDAPControlU *ctrls, int *target_pos, int *list_count, static int CDECL wrap_ldap_parse_vlvresponse_control( void *ld, LDAPControlU *ctrls, int *target_pos, int *list_count,
struct bervalU **ctx, int *errcode ) struct bervalU **ctx, int *errcode )
{ {
return ldap_parse_vlvresponse_control( ld, (LDAPControl *)ctrls, target_pos, list_count, (struct berval **)ctx, return ldap_parse_vlvresponse_control( ld, (LDAPControl *)ctrls, target_pos, list_count, (struct berval **)ctx,
errcode ); errcode );
} }
int CDECL wrap_ldap_rename( void *ld, const char *dn, const char *newrdn, const char *newparent, int delete, static int CDECL wrap_ldap_rename( void *ld, const char *dn, const char *newrdn, const char *newparent, int delete,
LDAPControlU **clientctrls, LDAPControlU **serverctrls, ULONG *msg ) LDAPControlU **clientctrls, LDAPControlU **serverctrls, ULONG *msg )
{ {
return ldap_rename( ld, dn ? dn : "", newrdn, newparent, delete, (LDAPControl **)clientctrls, return ldap_rename( ld, dn ? dn : "", newrdn, newparent, delete, (LDAPControl **)clientctrls,
(LDAPControl **)serverctrls, (int *)msg ); (LDAPControl **)serverctrls, (int *)msg );
} }
int CDECL wrap_ldap_rename_s( void *ld, const char *dn, const char *newrdn, const char *newparent, int delete, static int CDECL wrap_ldap_rename_s( void *ld, const char *dn, const char *newrdn, const char *newparent, int delete,
LDAPControlU **clientctrls, LDAPControlU **serverctrls ) LDAPControlU **clientctrls, LDAPControlU **serverctrls )
{ {
return ldap_rename_s( ld, dn ? dn : "", newrdn, newparent, delete, (LDAPControl **)clientctrls, return ldap_rename_s( ld, dn ? dn : "", newrdn, newparent, delete, (LDAPControl **)clientctrls,
(LDAPControl **)serverctrls ); (LDAPControl **)serverctrls );
} }
int CDECL wrap_ldap_result( void *ld, int msgid, int all, struct timevalU *timeout, void **result ) static int CDECL wrap_ldap_result( void *ld, int msgid, int all, struct timevalU *timeout, void **result )
{ {
return ldap_result( ld, msgid, all, (struct timeval *)timeout, (LDAPMessage **)result ); return ldap_result( ld, msgid, all, (struct timeval *)timeout, (LDAPMessage **)result );
} }
int CDECL wrap_ldap_sasl_bind( void *ld, const char *dn, const char *mech, struct bervalU *cred, static int CDECL wrap_ldap_sasl_bind( void *ld, const char *dn, const char *mech, struct bervalU *cred,
LDAPControlU **serverctrls, LDAPControlU **clientctrls, int *msgid ) LDAPControlU **serverctrls, LDAPControlU **clientctrls, int *msgid )
{ {
return ldap_sasl_bind( ld, dn, mech, (struct berval *)cred, (LDAPControl **)serverctrls, return ldap_sasl_bind( ld, dn, mech, (struct berval *)cred, (LDAPControl **)serverctrls,
(LDAPControl **)clientctrls, msgid ); (LDAPControl **)clientctrls, msgid );
} }
int CDECL wrap_ldap_sasl_bind_s( void *ld, const char *dn, const char *mech, struct bervalU *cred, static int CDECL wrap_ldap_sasl_bind_s( void *ld, const char *dn, const char *mech, struct bervalU *cred,
LDAPControlU **serverctrls, LDAPControlU **clientctrls, struct bervalU **servercred ) LDAPControlU **serverctrls, LDAPControlU **clientctrls, struct bervalU **servercred )
{ {
return ldap_sasl_bind_s( ld, dn, mech, (struct berval *)cred, (LDAPControl **)serverctrls, return ldap_sasl_bind_s( ld, dn, mech, (struct berval *)cred, (LDAPControl **)serverctrls,
@ -559,14 +559,14 @@ static int wrap_sasl_interact( LDAP *ld, unsigned int flags, void *defaults, voi
return -1; return -1;
} }
int CDECL wrap_ldap_sasl_interactive_bind_s( void *ld, const char *dn, const char *mech, LDAPControlU **serverctrls, static int CDECL wrap_ldap_sasl_interactive_bind_s( void *ld, const char *dn, const char *mech, LDAPControlU **serverctrls,
LDAPControlU **clientctrls, unsigned int flags, void *defaults ) LDAPControlU **clientctrls, unsigned int flags, void *defaults )
{ {
return ldap_sasl_interactive_bind_s( ld, dn, mech, (LDAPControl **)serverctrls, (LDAPControl **)clientctrls, flags, return ldap_sasl_interactive_bind_s( ld, dn, mech, (LDAPControl **)serverctrls, (LDAPControl **)clientctrls, flags,
wrap_sasl_interact, defaults ); wrap_sasl_interact, defaults );
} }
int CDECL wrap_ldap_search_ext( void *ld, const char *base, int scope, const char *filter, char **attrs, int attrsonly, static int CDECL wrap_ldap_search_ext( void *ld, const char *base, int scope, const char *filter, char **attrs, int attrsonly,
LDAPControlU **serverctrls, LDAPControlU **clientctrls, struct timevalU *timeout, LDAPControlU **serverctrls, LDAPControlU **clientctrls, struct timevalU *timeout,
int sizelimit, ULONG *msg ) int sizelimit, ULONG *msg )
{ {
@ -574,7 +574,7 @@ int CDECL wrap_ldap_search_ext( void *ld, const char *base, int scope, const cha
(LDAPControl **)clientctrls, (struct timeval *)timeout, sizelimit, (int *)msg ); (LDAPControl **)clientctrls, (struct timeval *)timeout, sizelimit, (int *)msg );
} }
int CDECL wrap_ldap_search_ext_s( void *ld, const char *base, int scope, const char *filter, char **attrs, static int CDECL wrap_ldap_search_ext_s( void *ld, const char *base, int scope, const char *filter, char **attrs,
int attrsonly, LDAPControlU **serverctrls, LDAPControlU **clientctrls, int attrsonly, LDAPControlU **serverctrls, LDAPControlU **clientctrls,
struct timevalU *timeout, int sizelimit, void **result ) struct timevalU *timeout, int sizelimit, void **result )
{ {
@ -583,27 +583,27 @@ int CDECL wrap_ldap_search_ext_s( void *ld, const char *base, int scope, const c
(LDAPMessage **)result ); (LDAPMessage **)result );
} }
int CDECL wrap_ldap_set_option( void *ld, int option, const void *value ) static int CDECL wrap_ldap_set_option( void *ld, int option, const void *value )
{ {
return ldap_set_option( ld, option, value ); return ldap_set_option( ld, option, value );
} }
int CDECL wrap_ldap_start_tls_s( void *ld, LDAPControlU **serverctrls, LDAPControlU **clientctrls ) static int CDECL wrap_ldap_start_tls_s( void *ld, LDAPControlU **serverctrls, LDAPControlU **clientctrls )
{ {
return ldap_start_tls_s( ld, (LDAPControl **)serverctrls, (LDAPControl **)clientctrls ); return ldap_start_tls_s( ld, (LDAPControl **)serverctrls, (LDAPControl **)clientctrls );
} }
int CDECL wrap_ldap_unbind_ext( void *ld, LDAPControlU **serverctrls, LDAPControlU **clientctrls ) static int CDECL wrap_ldap_unbind_ext( void *ld, LDAPControlU **serverctrls, LDAPControlU **clientctrls )
{ {
return ldap_unbind_ext( ld, (LDAPControl **)serverctrls, (LDAPControl **)clientctrls ); return ldap_unbind_ext( ld, (LDAPControl **)serverctrls, (LDAPControl **)clientctrls );
} }
int CDECL wrap_ldap_unbind_ext_s( void *ld, LDAPControlU **serverctrls, LDAPControlU **clientctrls ) static int CDECL wrap_ldap_unbind_ext_s( void *ld, LDAPControlU **serverctrls, LDAPControlU **clientctrls )
{ {
return ldap_unbind_ext_s( ld, (LDAPControl **)serverctrls, (LDAPControl **)clientctrls ); return ldap_unbind_ext_s( ld, (LDAPControl **)serverctrls, (LDAPControl **)clientctrls );
} }
void CDECL wrap_ldap_value_free_len( struct bervalU **values ) static void CDECL wrap_ldap_value_free_len( struct bervalU **values )
{ {
ldap_value_free_len( (struct berval **)values ); ldap_value_free_len( (struct berval **)values );
} }

82
dlls/wldap32/libldap.h
View file

@ -100,88 +100,6 @@ typedef struct sasl_interactU
unsigned int len; unsigned int len;
} sasl_interact_tU; } sasl_interact_tU;
extern void * CDECL wrap_ber_alloc_t(int) DECLSPEC_HIDDEN;
extern void CDECL wrap_ber_bvecfree(struct bervalU **) DECLSPEC_HIDDEN;
extern void CDECL wrap_ber_bvfree(struct bervalU *) DECLSPEC_HIDDEN;
extern unsigned int CDECL wrap_ber_first_element(void *, unsigned int *, char **) DECLSPEC_HIDDEN;
extern int CDECL wrap_ber_flatten(void *, struct bervalU **) DECLSPEC_HIDDEN;
extern void CDECL wrap_ber_free(void *, int) DECLSPEC_HIDDEN;
extern void * CDECL wrap_ber_init(struct bervalU *) DECLSPEC_HIDDEN;
extern unsigned int CDECL wrap_ber_next_element(void *, unsigned int *, char *) DECLSPEC_HIDDEN;
extern unsigned int CDECL wrap_ber_peek_tag(void *, unsigned int *) DECLSPEC_HIDDEN;
extern unsigned int CDECL wrap_ber_skip_tag(void *, unsigned int *) DECLSPEC_HIDDEN;
extern int WINAPIV wrap_ber_printf(void *, char *, ...) DECLSPEC_HIDDEN;
extern int WINAPIV wrap_ber_scanf(void *, char *, ...) DECLSPEC_HIDDEN;
extern int CDECL wrap_ldap_abandon_ext(void *, int, LDAPControlU **, LDAPControlU **) DECLSPEC_HIDDEN;
extern int CDECL wrap_ldap_add_ext(void *, const char *, LDAPModU **, LDAPControlU **, LDAPControlU **,
ULONG *) DECLSPEC_HIDDEN;
extern int CDECL wrap_ldap_add_ext_s(void *, const char *, LDAPModU **, LDAPControlU **,
LDAPControlU **) DECLSPEC_HIDDEN;
extern int CDECL wrap_ldap_compare_ext(void *, const char *, const char *, struct bervalU *, LDAPControlU **,
LDAPControlU **, ULONG *) DECLSPEC_HIDDEN;
extern int CDECL wrap_ldap_compare_ext_s(void *, const char *, const char *, struct bervalU *, LDAPControlU **,
LDAPControlU **) DECLSPEC_HIDDEN;
extern void CDECL wrap_ldap_control_free(LDAPControlU *) DECLSPEC_HIDDEN;
extern void CDECL wrap_ldap_controls_free(LDAPControlU **) DECLSPEC_HIDDEN;
extern int CDECL wrap_ldap_count_entries(void *, void *) DECLSPEC_HIDDEN;
extern int CDECL wrap_ldap_count_references(void *, void *) DECLSPEC_HIDDEN;
extern int CDECL wrap_ldap_count_values_len(struct bervalU **) DECLSPEC_HIDDEN;
extern int CDECL wrap_ldap_create_sort_control(void *, LDAPSortKeyU **, int, LDAPControlU **) DECLSPEC_HIDDEN;
extern int CDECL wrap_ldap_create_vlv_control(void *, LDAPVLVInfoU *, LDAPControlU **) DECLSPEC_HIDDEN;
extern int CDECL wrap_ldap_delete_ext(void *, const char *, LDAPControlU **, LDAPControlU **, ULONG *) DECLSPEC_HIDDEN;
extern int CDECL wrap_ldap_delete_ext_s(void *, const char *, LDAPControlU **, LDAPControlU **) DECLSPEC_HIDDEN;
extern char * CDECL wrap_ldap_dn2ufn(const char *) DECLSPEC_HIDDEN;
extern char ** CDECL wrap_ldap_explode_dn(const char *, int) DECLSPEC_HIDDEN;
extern int CDECL wrap_ldap_extended_operation(void *, const char *, struct bervalU *, LDAPControlU **,
LDAPControlU **, ULONG *) DECLSPEC_HIDDEN;
extern int CDECL wrap_ldap_extended_operation_s(void *, const char *, struct bervalU *, LDAPControlU **,
LDAPControlU **, char **, struct bervalU **) DECLSPEC_HIDDEN;
extern char * CDECL wrap_ldap_get_dn(void *, void *) DECLSPEC_HIDDEN;
extern int CDECL wrap_ldap_get_option(void *, int, void *) DECLSPEC_HIDDEN;
extern struct bervalU ** CDECL wrap_ldap_get_values_len(void *, void *, const char *) DECLSPEC_HIDDEN;
extern int CDECL wrap_ldap_initialize(void **, const char *) DECLSPEC_HIDDEN;
extern char * CDECL wrap_ldap_first_attribute(void *, void *, void **) DECLSPEC_HIDDEN;
extern void * CDECL wrap_ldap_first_entry(void *, void *) DECLSPEC_HIDDEN;
extern void * CDECL wrap_ldap_first_reference(void *, void *) DECLSPEC_HIDDEN;
extern void CDECL wrap_ldap_memfree(void *) DECLSPEC_HIDDEN;
extern void CDECL wrap_ldap_memvfree(void **) DECLSPEC_HIDDEN;
extern int CDECL wrap_ldap_modify_ext(void *, const char *, LDAPModU **, LDAPControlU **, LDAPControlU **,
ULONG *) DECLSPEC_HIDDEN;
extern int CDECL wrap_ldap_modify_ext_s(void *, const char *, LDAPModU **, LDAPControlU **,
LDAPControlU **) DECLSPEC_HIDDEN;
extern int CDECL wrap_ldap_msgfree(void *) DECLSPEC_HIDDEN;
extern char * CDECL wrap_ldap_next_attribute(void *, void *, void *) DECLSPEC_HIDDEN;
extern void * CDECL wrap_ldap_next_entry(void *, void *) DECLSPEC_HIDDEN;
extern void * CDECL wrap_ldap_next_reference(void *, void *) DECLSPEC_HIDDEN;
extern int CDECL wrap_ldap_parse_extended_result(void *, void *, char **, struct bervalU **, int) DECLSPEC_HIDDEN;
extern int CDECL wrap_ldap_parse_reference(void *, void *, char ***, LDAPControlU ***, int) DECLSPEC_HIDDEN;
extern int CDECL wrap_ldap_parse_result(void *, void *, int *, char **, char **, char ***, LDAPControlU ***,
int) DECLSPEC_HIDDEN;
extern int CDECL wrap_ldap_parse_sortresponse_control(void *, LDAPControlU *, int *, char **) DECLSPEC_HIDDEN;
extern int CDECL wrap_ldap_parse_vlvresponse_control(void *, LDAPControlU *, int *, int *, struct bervalU **,
int *) DECLSPEC_HIDDEN;
extern int CDECL wrap_ldap_rename(void *, const char *, const char *, const char *, int, LDAPControlU **,
LDAPControlU **, ULONG *) DECLSPEC_HIDDEN;
extern int CDECL wrap_ldap_rename_s(void *, const char *, const char *, const char *, int, LDAPControlU **,
LDAPControlU **) DECLSPEC_HIDDEN;
extern int CDECL wrap_ldap_result(void *, int, int, struct timevalU *, void **) DECLSPEC_HIDDEN;
extern int CDECL wrap_ldap_sasl_bind(void *, const char *, const char *, struct bervalU *, LDAPControlU **,
LDAPControlU **, int *) DECLSPEC_HIDDEN;
extern int CDECL wrap_ldap_sasl_bind_s(void *, const char *, const char *, struct bervalU *, LDAPControlU **,
LDAPControlU **, struct bervalU **) DECLSPEC_HIDDEN;
extern int CDECL wrap_ldap_sasl_interactive_bind_s(void *, const char *, const char *, LDAPControlU **,
LDAPControlU **, unsigned int, void *) DECLSPEC_HIDDEN;
extern int CDECL wrap_ldap_search_ext(void *, const char *, int, const char *, char **, int, LDAPControlU **,
LDAPControlU **, struct timevalU *, int, ULONG *) DECLSPEC_HIDDEN;
extern int CDECL wrap_ldap_search_ext_s(void *, const char *, int, const char *, char **, int, LDAPControlU **,
LDAPControlU **, struct timevalU *, int, void **) DECLSPEC_HIDDEN;
extern int CDECL wrap_ldap_set_option(void *, int, const void *) DECLSPEC_HIDDEN;
extern int CDECL wrap_ldap_start_tls_s(void *, LDAPControlU **, LDAPControlU **) DECLSPEC_HIDDEN;
extern int CDECL wrap_ldap_unbind_ext(void *, LDAPControlU **, LDAPControlU **) DECLSPEC_HIDDEN;
extern int CDECL wrap_ldap_unbind_ext_s(void *, LDAPControlU **, LDAPControlU **) DECLSPEC_HIDDEN;
extern void CDECL wrap_ldap_value_free_len(struct bervalU **) DECLSPEC_HIDDEN;
struct ldap_funcs struct ldap_funcs
{ {
void * (CDECL *fn_ber_alloc_t)(int); void * (CDECL *fn_ber_alloc_t)(int);