Remove lint

[openldap] / libraries / libldap / add.c

diff --git a/libraries/libldap/add.c b/libraries/libldap/add.c
index 56ce242e485a48504b7a706dfbc8a4f49a7fb56c..34f61e8c8f25d14680a464b3a093729a862a483e 100644 (file)
--- a/libraries/libldap/add.c
+++ b/libraries/libldap/add.c
@@ -1,5 +1,6 @@
+/* $OpenLDAP$ */
 /*
- * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 /*  Portions
@@ -87,7 +88,10 @@ ldap_add( LDAP *ld, LDAP_CONST char *dn, LDAPMod **attrs )
  *     rc = ldap_add_ext( ld, dn, attrs, NULL, NULL, &msgid );
  */
 int
-ldap_add_ext( LDAP *ld, LDAP_CONST char *dn, LDAPMod **attrs,
+ldap_add_ext(
+       LDAP *ld,
+       LDAP_CONST char *dn,
+       LDAPMod **attrs,
        LDAPControl **sctrls,
        LDAPControl **cctrls,
        int     *msgidp )
@@ -96,14 +100,18 @@ ldap_add_ext( LDAP *ld, LDAP_CONST char *dn, LDAPMod **attrs,
        int             i, rc;
 
        Debug( LDAP_DEBUG_TRACE, "ldap_add\n", 0, 0, 0 );
+       assert( ld != NULL );
+       assert( LDAP_VALID( ld ) );
+       assert( dn != NULL );
+       assert( msgidp != NULL );
 
        /* create a message to send */
-       if ( (ber = ldap_alloc_ber_with_options( ld )) == NULLBER ) {
+       if ( (ber = ldap_alloc_ber_with_options( ld )) == NULL ) {
                ld->ld_errno = LDAP_NO_MEMORY;
                return ld->ld_errno;
        }
 
-       rc = ber_printf( ber, "{it{s{", /* leave open '}}}' */
+       rc = ber_printf( ber, "{it{s{", /* '}}}' */
                ++ld->ld_msgid, LDAP_REQ_ADD, dn );
 
        if ( rc == -1 ) {
@@ -128,8 +136,7 @@ ldap_add_ext( LDAP *ld, LDAP_CONST char *dn, LDAPMod **attrs,
                }
        }
 
-       /* close '{{' */
-       if ( ber_printf( ber, "}}" ) == -1 ) {
+       if ( ber_printf( ber, /*{{*/ "}}" ) == -1 ) {
                ld->ld_errno = LDAP_ENCODING_ERROR;
                ber_free( ber, 1 );
                return ld->ld_errno;
@@ -141,8 +148,7 @@ ldap_add_ext( LDAP *ld, LDAP_CONST char *dn, LDAPMod **attrs,
                return ld->ld_errno;
        }
 
-       /* close '{' */
-       if ( ber_printf( ber, "}" ) == -1 ) {
+       if ( ber_printf( ber, /*{*/ "}" ) == -1 ) {
                ld->ld_errno = LDAP_ENCODING_ERROR;
                ber_free( ber, 1 );
                return ld->ld_errno;