group rewrite/map stuff in one structure and optimize more function calls

[openldap] / servers / slapd / back-meta / compare.c

diff --git a/servers/slapd/back-meta/compare.c b/servers/slapd/back-meta/compare.c
index 3da152810fbbbac1f2aeb2a937c746b112e4109f..d272ab42dc20838b5bc06054333def8238246651 100644 (file)
--- a/servers/slapd/back-meta/compare.c
+++ b/servers/slapd/back-meta/compare.c
@@ -86,7 +86,7 @@ meta_back_compare( Operation *op, SlapReply *rs )
                int cres = LDAP_SUCCESS, rres = LDAP_SUCCESS;
        int *msgid;
 
-       lc = meta_back_getconn( li, op, rs, META_OP_ALLOW_MULTIPLE,
+       lc = meta_back_getconn( op, rs, META_OP_ALLOW_MULTIPLE,
                        &op->o_req_ndn, NULL );
        if ( !lc ) {
                send_ldap_result( op, rs );
@@ -233,8 +233,8 @@ meta_back_compare( Operation *op, SlapReply *rs )
                                        goto finish;
                                }
                                
-                               cres = ldap_result2error( lsc->ld, res, 1 );
-                               switch ( cres ) {
+                               rs->sr_err = ldap_result2error( lsc->ld, res, 1 );
+                               switch ( rs->sr_err ) {
                                case LDAP_COMPARE_TRUE:
                                case LDAP_COMPARE_FALSE:
 
@@ -251,7 +251,7 @@ meta_back_compare( Operation *op, SlapReply *rs )
                                        break;
 
                                default:
-                                       rres = ldap_back_map_result( cres );
+                                       rres = ldap_back_map_result( rs );
 
                                        if ( err != NULL ) {
                                                free( err );