Remove lint

[openldap] / servers / slapd / result.c

diff --git a/servers/slapd/result.c b/servers/slapd/result.c
index 425db124c59807174b2ba1dbcc98e89a9efe8b41..e23f9b43682a033ab8f9ae1fca968acbc7d3ca2a 100644 (file)
--- a/servers/slapd/result.c
+++ b/servers/slapd/result.c
@@ -213,7 +213,7 @@ send_ldap_response(
        LDAPControl **ctrls
 )
 {
-       char berbuf[256];
+       char berbuf[LBER_ELEMENT_SIZEOF];
        BerElement      *ber = (BerElement *)berbuf;
        int             rc;
        long    bytes;
@@ -224,10 +224,6 @@ send_ldap_response(
                return;
        }
                
-#ifndef LDAP_CLIENT_UPDATE
-       assert( ctrls == NULL ); /* ctrls not implemented */
-#endif /* LDAP_CLIENT_UPDATE */
-
        ber_init_w_nullc( ber, LBER_USE_DER );
 
 #ifdef NEW_LOGGING
@@ -254,8 +250,9 @@ send_ldap_response(
        }
 
 #ifdef LDAP_CONNECTIONLESS
-       if (conn->c_is_udp) {
-           rc = ber_write(ber, (char *)&op->o_peeraddr, sizeof(struct sockaddr), 0);
+       if( conn->c_is_udp ) {
+           rc = ber_write(ber,
+                       (char *)&op->o_peeraddr, sizeof(struct sockaddr), 0);
            if (rc != sizeof(struct sockaddr)) {
 #ifdef NEW_LOGGING
                LDAP_LOG( OPERATION, ERR, 
@@ -658,7 +655,7 @@ send_search_entry(
        LDAPControl **ctrls
 )
 {
-       char            berbuf[256];
+       char berbuf[LBER_ELEMENT_SIZEOF];
        BerElement      *ber = (BerElement *)berbuf;
        Attribute       *a, *aa;
        int             i, j, rc=-1, bytes;
@@ -713,17 +710,18 @@ send_search_entry(
 
 #ifdef LDAP_CONNECTIONLESS
        if (conn->c_is_udp) {
-           rc = ber_write(ber, (char *)&op->o_peeraddr, sizeof(struct sockaddr), 0);
+           rc = ber_write(ber,
+                       (char *)&op->o_peeraddr, sizeof(struct sockaddr), 0);
            if (rc != sizeof(struct sockaddr)) {
 #ifdef NEW_LOGGING
-               LDAP_LOG( OPERATION, ERR, 
-                       "send_search_entry: conn %lu  ber_printf failed\n",
-                       conn ? conn->c_connid : 0, 0, 0 );
+                       LDAP_LOG( OPERATION, ERR, 
+                               "send_search_entry: conn %lu  ber_printf failed\n",
+                               conn ? conn->c_connid : 0, 0, 0 );
 #else
-               Debug( LDAP_DEBUG_ANY, "ber_printf failed\n", 0, 0, 0 );
+                       Debug( LDAP_DEBUG_ANY, "ber_printf failed\n", 0, 0, 0 );
 #endif
-               ber_free_buf( ber );
-               return( 1 );
+                       ber_free_buf( ber );
+                       return( 1 );
            }
        }
        if (conn->c_is_udp && op->o_protocol == LDAP_VERSION2) {
@@ -1129,8 +1127,9 @@ send_search_entry(
        }
 
 #ifdef LDAP_CONNECTIONLESS
-       if (conn->c_is_udp && op->o_protocol == LDAP_VERSION2 && rc != -1)
+       if (conn->c_is_udp && op->o_protocol == LDAP_VERSION2 && rc != -1) {
                rc = ber_printf( ber, "}" );
+       }
 #endif
        if ( rc == -1 ) {
 #ifdef NEW_LOGGING
@@ -1198,7 +1197,7 @@ send_search_reference(
     BerVarray *v2refs
 )
 {
-       char            berbuf[256];
+       char berbuf[LBER_ELEMENT_SIZEOF];
        BerElement      *ber = (BerElement *)berbuf;
        int rc;
        int bytes;