diff options
| author | Toomas Soome <tsoome@me.com> | 2018-11-22 18:26:49 +0200 |
|---|---|---|
| committer | Toomas Soome <tsoome@me.com> | 2019-12-18 19:43:04 +0200 |
| commit | c94f4b0313ed735fc39e1b15e1fa48c0e6e3730f (patch) | |
| tree | 8a9f72517777505f91d0927ed923c31b25757fd8 | |
| parent | 3c19a1689122901345a6089d081aa2de4a1096da (diff) | |
| download | illumos-gate-c94f4b0313ed735fc39e1b15e1fa48c0e6e3730f.tar.gz | |
12081 libldap5: cast between incompatible function types
Reviewed by: C Fraire <cfraire@me.com>
Approved by: Dan McDonald <danmcd@joyent.com>
| -rw-r--r-- | usr/src/lib/libldap5/sources/ldap/common/open.c | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/usr/src/lib/libldap5/sources/ldap/common/open.c b/usr/src/lib/libldap5/sources/ldap/common/open.c index c97685f223..d10802a26b 100644 --- a/usr/src/lib/libldap5/sources/ldap/common/open.c +++ b/usr/src/lib/libldap5/sources/ldap/common/open.c @@ -34,7 +34,7 @@ */ #if 0 -#ifndef lint +#ifndef lint static char copyright[] = "@(#) Copyright (c) 1995 Regents of the University of Michigan.\nAll rights reserved.\n"; #endif #endif @@ -82,7 +82,7 @@ struct nsldapi_ldap_error { #else __declspec ( thread ) int nsldapi_gldaperrno; __declspec ( thread ) char *nsldapi_gmatched = NULL; -__declspec ( thread ) char *nsldapi_gldaperror = NULL; +__declspec ( thread ) char *nsldapi_gldaperror = NULL; #endif /* _WINDOWS */ #ifdef _WINDOWS @@ -245,18 +245,18 @@ get_ld_error( char **matched, char **errmsg, void *dummy ) le = pthread_getspecific( nsldapi_key ); if (le != NULL) { - if ( matched != NULL ) { - *matched = le->le_matched; - } - if ( errmsg != NULL ) { - *errmsg = le->le_errmsg; - } - return( le->le_errno ); + if ( matched != NULL ) { + *matched = le->le_matched; + } + if ( errmsg != NULL ) { + *errmsg = le->le_errmsg; + } + return( le->le_errno ); } else { - if ( matched != NULL ) - *matched = NULL; - if ( errmsg != NULL ) - *errmsg = NULL; + if ( matched != NULL ) + *matched = NULL; + if ( errmsg != NULL ) + *errmsg = NULL; } return (LDAP_SUCCESS); } @@ -292,7 +292,7 @@ static struct ldap_extra_thread_fns #ifdef _WINDOWS 0 #else - (void *(*)(void))pthread_self + (void *(*)(void))(uintptr_t)pthread_self #endif /* _WINDOWS */ }; @@ -393,8 +393,8 @@ ldap_version( LDAPVersion *ver ) ver->sdk_version = (int)(VI_PRODUCTVERSION * 100); ver->protocol_version = LDAP_VERSION_MAX * 100; ver->SSL_version = SSL_VERSION * 100; - /* - * set security to none by default + /* + * set security to none by default */ ver->security_level = LDAP_SECURITY_NONE; @@ -710,7 +710,7 @@ ldap_x_hostlist_next( char **hostp, int *portp, status->lhs_nexthost = NULL; } - /* + /* * Look for closing ']' and skip past it before looking for port. */ if ( squarebrackets && NULL != ( q = strchr( *hostp, ']' ))) { |