mirror of
git://source.winehq.org/git/wine.git
synced 2024-10-06 09:54:05 +00:00
wldap32: Use the wcsdup function instead of reimplementing it.
This commit is contained in:
parent
5d1820c40b
commit
7f5a718926
|
@ -215,7 +215,7 @@ ULONG CDECL ldap_encode_sort_controlW( LDAP *ld, LDAPSortKeyW **sortkeys, LDAPCo
|
|||
|
||||
if ((result = ldap_create_sort_controlW( ld, sortkeys, critical, &control )) == WLDAP32_LDAP_SUCCESS)
|
||||
{
|
||||
ret->ldctl_oid = strdupW(control->ldctl_oid);
|
||||
ret->ldctl_oid = wcsdup( control->ldctl_oid );
|
||||
bv_val_dup( &control->ldctl_value, &ret->ldctl_value );
|
||||
ret->ldctl_iscritical = control->ldctl_iscritical;
|
||||
ldap_control_freeW( control );
|
||||
|
|
|
@ -297,8 +297,8 @@ LDAPSearch * CDECL ldap_search_init_pageW( LDAP *ld, WCHAR *dn, ULONG scope, WCH
|
|||
return NULL;
|
||||
}
|
||||
|
||||
if (dn && !(search->dn = strdupW( dn ))) goto fail;
|
||||
if (filter && !(search->filter = strdupW( filter ))) goto fail;
|
||||
if (dn && !(search->dn = wcsdup( dn ))) goto fail;
|
||||
if (filter && !(search->filter = wcsdup( filter ))) goto fail;
|
||||
if (attrs && !(search->attrs = strarraydupW( attrs ))) goto fail;
|
||||
|
||||
len = serverctrls ? controlarraylenW( serverctrls ) : 0;
|
||||
|
|
|
@ -542,14 +542,6 @@ static inline char *strdupU( const char *src )
|
|||
return dst;
|
||||
}
|
||||
|
||||
static inline WCHAR *strdupW( const WCHAR *src )
|
||||
{
|
||||
WCHAR *dst;
|
||||
if (!src) return NULL;
|
||||
if ((dst = malloc( (lstrlenW( src ) + 1) * sizeof(WCHAR) ))) lstrcpyW( dst, src );
|
||||
return dst;
|
||||
}
|
||||
|
||||
static inline char *strWtoU( const WCHAR *str )
|
||||
{
|
||||
char *ret = NULL;
|
||||
|
@ -652,7 +644,7 @@ static inline WCHAR **strarraydupW( WCHAR **strarray )
|
|||
{
|
||||
WCHAR **p = strarray, **q = ret;
|
||||
|
||||
while (*p) *q++ = strdupW( *p++ );
|
||||
while (*p) *q++ = wcsdup( *p++ );
|
||||
*q = NULL;
|
||||
}
|
||||
}
|
||||
|
@ -1225,7 +1217,7 @@ static inline LDAPControlW *controldupW( LDAPControlW *control )
|
|||
return NULL;
|
||||
}
|
||||
|
||||
ret->ldctl_oid = strdupW( control->ldctl_oid );
|
||||
ret->ldctl_oid = wcsdup( control->ldctl_oid );
|
||||
ret->ldctl_value.bv_len = len;
|
||||
ret->ldctl_value.bv_val = val;
|
||||
ret->ldctl_iscritical = control->ldctl_iscritical;
|
||||
|
|
Loading…
Reference in a new issue