Minor header cleanup.

diff --git a/include/lber.h b/include/lber.h
index 20fd9c51ad6208fc6f7817a8f32156d85341cd2d..d3ed3fc272a21fc0428256324bb037d2252a354d 100644 (file)
--- a/include/lber.h
+++ b/include/lber.h
@@ -168,7 +168,7 @@ ber_skip_tag LDAP_P((
 
 LDAP_F( unsigned long )
 ber_peek_tag LDAP_P((
-       LDAP_CONST BerElement *ber,     /* not const in c-api-02 */
+       LDAP_CONST BerElement *ber,
        unsigned long *len ));
 
 LDAP_F( unsigned long )
@@ -360,7 +360,7 @@ der_alloc LDAP_P(( void )); /* DEPRECATED */
 
 LDAP_F( BerElement * )
 ber_alloc_t LDAP_P((
-       int options ));
+       int beroptions ));
 
 LDAP_F( BerElement * )
 ber_dup LDAP_P((

diff --git a/include/ldap.h b/include/ldap.h
index cbda15c325a738906e4b69191d37aef1dcd091de..befa1e05a3143c34e3058e642f9e27c0d2352d48 100644 (file)
--- a/include/ldap.h
+++ b/include/ldap.h
@@ -135,7 +135,7 @@ typedef struct ldapcontrol {
        char *                  ldctl_oid;
        struct berval   ldctl_value;
        char                    ldctl_iscritical;
-} LDAPControl, *PLDAPControl;
+} LDAPControl;
 
 /* LDAP "Standard" Controls */
 #define LDAP_CONTROL_REFERRALS "1.2.840.113666.1.4.616"
@@ -709,7 +709,7 @@ ldap_kerberos_bind2_s LDAP_P((
 
 /*
  * in cache.c
- * DEPRECATED
+ * (deprecated)
  */
 LDAP_F( int )
 ldap_enable_cache LDAP_P(( LDAP *ld, long timeout, long maxmem ));
@@ -852,7 +852,7 @@ ldap_modify_s LDAP_P((
 
 
 /*
- * in rename.c:
+ * in modrdn.c:
  */
 LDAP_F( int )
 ldap_rename_ext LDAP_P((
@@ -875,10 +875,22 @@ ldap_rename_ext_s LDAP_P((
        LDAPControl             **serverctrls,
        LDAPControl             **clientctrls ));
 
+LDAP_F( int )
+ldap_rename2 LDAP_P((
+       LDAP *ld,
+       LDAP_CONST char *dn,
+       LDAP_CONST char *newrdn,
+       int deleteoldrdn,
+       LDAP_CONST char *newSuperior ));
+
+LDAP_F( int )
+ldap_rename2_s LDAP_P((
+       LDAP *ld,
+       LDAP_CONST char *dn,
+       LDAP_CONST char *newrdn,
+       int deleteoldrdn,
+       LDAP_CONST char *newSuperior));
 
-/*
- * in modrdn.c:
- */
 LDAP_F( int )
 ldap_modrdn LDAP_P((
        LDAP *ld,
@@ -905,21 +917,6 @@ ldap_modrdn2_s LDAP_P((
        LDAP_CONST char *newrdn,
        int deleteoldrdn));
 
-LDAP_F( int )
-ldap_rename2 LDAP_P((
-       LDAP *ld,
-       LDAP_CONST char *dn,
-       LDAP_CONST char *newrdn,
-       int deleteoldrdn,
-       LDAP_CONST char *newSuperior ));
-
-LDAP_F( int )
-ldap_rename2_s LDAP_P((
-       LDAP *ld,
-       LDAP_CONST char *dn,
-       LDAP_CONST char *newrdn,
-       int deleteoldrdn,
-       LDAP_CONST char *newSuperior));
 
 /*
  * in open.c:
@@ -1327,6 +1324,7 @@ ldap_build_filter LDAP_P((
 /*
  * in free.c
  */
+
 LDAP_F( void )
 ldap_memfree LDAP_P((
        void *p ));