s/exit(1)/exit(EXIT_FAILURE)/

[openldap] / libraries / libldap / delete.c

diff --git a/libraries/libldap/delete.c b/libraries/libldap/delete.c
index bc260b205e718eb7a625d62dd78d8ed8e929ef09..0413c235cf977d4c094bacf230acf13a35cddd7a 100644 (file)
--- a/libraries/libldap/delete.c
+++ b/libraries/libldap/delete.c
@@ -9,6 +9,11 @@
  *  delete.c
  */
 
+/*
+ * A delete request looks like this:
+ *     DelRequet ::= DistinguishedName,
+ */
+
 #include "portable.h"
 
 #include <stdio.h>
@@ -41,20 +46,20 @@ ldap_delete_ext(
 {
        BerElement      *ber;
 
-       /*
-        * A delete request looks like this:
-        *      DelRequet ::= DistinguishedName,
-        */
-
        Debug( LDAP_DEBUG_TRACE, "ldap_delete\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 );
        }
 
-       if ( ber_printf( ber, "{its", /* leave open - '}' */
+       if ( ber_printf( ber, "{its", /* '}' */
                ++ld->ld_msgid, LDAP_REQ_DELETE, dn ) == -1 )
        {
                ld->ld_errno = LDAP_ENCODING_ERROR;
@@ -68,9 +73,7 @@ ldap_delete_ext(
                return ld->ld_errno;
        }
 
-       /* close '{' */
-       if ( ber_printf( ber, "}", ++ld->ld_msgid, LDAP_REQ_DELETE, dn )
-           == -1 ) {
+       if ( ber_printf( ber, /*{*/ "}" ) == -1 ) {
                ld->ld_errno = LDAP_ENCODING_ERROR;
                ber_free( ber, 1 );
                return( ld->ld_errno );