moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-21 23:58:49 -05:00
Code Issues Releases Wiki Activity

ldap: Fixed attribute variable warnings when Unicode is enabled

Browse Source 
Use 'TCHAR *' for local attribute variable rather than 'char *'.
This commit is contained in:
Steve Holme 2015-01-03 21:19:11 +00:00
parent 5359936d07
commit c37dcf0edb
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/ldap.c
View File

@ -425,7 +425,12 @@ static CURLcode Curl_ldap(struct connectdata *conn, bool *done)
entryIterator; entryIterator;
entryIterator = ldap_next_entry(server, entryIterator), num++) { entryIterator = ldap_next_entry(server, entryIterator), num++) {
BerElement *ber = NULL; BerElement *ber = NULL;
#if defined(CURL_LDAP_WIN) && \
(defined(USE_WIN32_IDN) || defined(USE_WINDOWS_SSPI))
TCHAR *attribute;
#else
char *attribute; /*! suspicious that this isn't 'const' */ char *attribute; /*! suspicious that this isn't 'const' */
#endif
int i; int i;
/* Get the DN and write it to the client */ /* Get the DN and write it to the client */
@ -469,7 +474,12 @@ static CURLcode Curl_ldap(struct connectdata *conn, bool *done)
for(attribute = ldap_first_attribute(server, entryIterator, &ber); for(attribute = ldap_first_attribute(server, entryIterator, &ber);
attribute; attribute;
attribute = ldap_next_attribute(server, entryIterator, ber)) { attribute = ldap_next_attribute(server, entryIterator, ber)) {
#if defined(CURL_LDAP_WIN) && \
(defined(USE_WIN32_IDN) || defined(USE_WINDOWS_SSPI))
size_t attr_len = _tcslen(attribute);
#else
size_t attr_len = strlen(attribute); size_t attr_len = strlen(attribute);
#endif
BerValue **vals = ldap_get_values_len(server, entryIterator, attribute); BerValue **vals = ldap_get_values_len(server, entryIterator, attribute);
if(vals != NULL) { if(vals != NULL) {