From: Pierangelo Masarati <ando@openldap.org>
Date: Wed, 12 Jan 2005 21:02:58 +0000 (+0000)
Subject: cosmetic cleanup
X-Git-Tag: OPENLDAP_REL_ENG_2_3_BP~407
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=4e06af2247ea02bc100a25d56995c95a0fe99417;p=openldap

cosmetic cleanup
---

diff --git a/servers/slapd/extended.c b/servers/slapd/extended.c
index 7bcee12973..6d3237cae4 100644
--- a/servers/slapd/extended.c
+++ b/servers/slapd/extended.c
@@ -183,6 +183,7 @@ do_extended(
 
 	op->o_bd = frontendDB;
 	rs->sr_err = frontendDB->be_extended( op, rs );
+
 done:
 	return rs->sr_err;
 }
diff --git a/servers/slapd/modrdn.c b/servers/slapd/modrdn.c
index f6157df780..44f97d059e 100644
--- a/servers/slapd/modrdn.c
+++ b/servers/slapd/modrdn.c
@@ -181,7 +181,6 @@ do_modrdn(
 	rs->sr_err = frontendDB->be_modrdn( op, rs );
 
 cleanup:
-
 	slap_graduate_commit_csn( op );
 
 	op->o_tmpfree( op->o_req_dn.bv_val, op->o_tmpmemctx );
@@ -190,8 +189,10 @@ cleanup:
 	op->o_tmpfree( op->orr_newrdn.bv_val, op->o_tmpmemctx );	
 	op->o_tmpfree( op->orr_nnewrdn.bv_val, op->o_tmpmemctx );	
 
-	if ( pnewSuperior.bv_val ) op->o_tmpfree( pnewSuperior.bv_val, op->o_tmpmemctx );
-	if ( nnewSuperior.bv_val ) op->o_tmpfree( nnewSuperior.bv_val, op->o_tmpmemctx );
+	if ( !BER_BVISNULL( &pnewSuperior ) ) 
+		op->o_tmpfree( pnewSuperior.bv_val, op->o_tmpmemctx );
+	if ( !BER_BVISNULL( &nnewSuperior ) )
+		op->o_tmpfree( nnewSuperior.bv_val, op->o_tmpmemctx );
 
 	return rs->sr_err;
 }