upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-22 15:49:34 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Minor const'ification cleanup

Browse source
This commit is contained in:
Kurt Zeilenga 2002-01-08 20:24:56 +00:00
parent 587d36e18b
commit f80b4ad53e
2 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
include/ldap.h
View file

@ -578,7 +578,7 @@ ldap_set_rebind_proc LDAP_P((
*/ */
LDAP_F( int ) LDAP_F( int )
ldap_create_control LDAP_P(( ldap_create_control LDAP_P((
const char *requestOID, LDAP_CONST char *requestOID,
BerElement *ber, BerElement *ber,
int iscritical, int iscritical,
LDAPControl **ctrlp )); LDAPControl **ctrlp ));
@ -1221,9 +1221,9 @@ ldap_dn2str LDAP_P((
LDAP_F( int ) LDAP_F( int )
ldap_str2rdn LDAP_P(( ldap_str2rdn LDAP_P((
const char *str, LDAP_CONST char *str,
LDAPRDN **rdn, LDAPRDN **rdn,
const char **next, char **next,
unsigned flags )); unsigned flags ));
LDAP_F( int ) LDAP_F( int )

13
libraries/libldap/getdn.c
View file

@ -174,7 +174,7 @@ ldap_explode_rdn( LDAP_CONST char *rdn, int notypes )
* FIXME: we prefer efficiency over checking if the _ENTIRE_ * FIXME: we prefer efficiency over checking if the _ENTIRE_
* dn can be parsed * dn can be parsed
*/ */
if ( ldap_str2rdn( rdn, &tmpRDN, &p, LDAP_DN_FORMAT_LDAP ) if ( ldap_str2rdn( rdn, &tmpRDN, (char **) &p, LDAP_DN_FORMAT_LDAP )
!= LDAP_SUCCESS ) { != LDAP_SUCCESS ) {
return( NULL ); return( NULL );
} }
@ -299,7 +299,8 @@ ldap_dn2ad_canonical( LDAP_CONST char *dn )
* LDAP_DN_FORMAT_AD_CANONICAL (?) * LDAP_DN_FORMAT_AD_CANONICAL (?)
*/ */
int int
ldap_dn_normalize( const char *dnin, unsigned fin, char **dnout, unsigned fout ) ldap_dn_normalize( LDAP_CONST char *dnin,
unsigned fin, char **dnout, unsigned fout )
{ {
int rc; int rc;
LDAPDN *tmpDN = NULL; LDAPDN *tmpDN = NULL;
@ -589,7 +590,7 @@ ldap_dnfree( LDAPDN *dn )
#define TMP_SLOTS 1024 #define TMP_SLOTS 1024
int int
ldap_str2dn( const char *str, LDAPDN **dn, unsigned flags ) ldap_str2dn( LDAP_CONST char *str, LDAPDN **dn, unsigned flags )
{ {
const char *p; const char *p;
int rc = LDAP_DECODING_ERROR; int rc = LDAP_DECODING_ERROR;
@ -651,7 +652,7 @@ ldap_str2dn( const char *str, LDAPDN **dn, unsigned flags )
for ( ; p[ 0 ]; p++ ) { for ( ; p[ 0 ]; p++ ) {
int err; int err;
err = ldap_str2rdn( p, &newRDN, &p, flags ); err = ldap_str2rdn( p, &newRDN, (char **) &p, flags );
if ( err != LDAP_SUCCESS ) { if ( err != LDAP_SUCCESS ) {
goto parsing_error; goto parsing_error;
} }
@ -757,8 +758,10 @@ return_result:;
* corresponds to the rdn separator or to '\0' in case the string is over. * corresponds to the rdn separator or to '\0' in case the string is over.
*/ */
int int
ldap_str2rdn( const char *str, LDAPRDN **rdn, const char **n, unsigned flags ) ldap_str2rdn( LDAP_CONST char *str, LDAPRDN **rdn,
char **n_in, unsigned flags )
{ {
const char **n = (const char **) n_in;
const char *p; const char *p;
int navas = 0; int navas = 0;
int state = B4AVA; int state = B4AVA;