Fallout from ITS#4986 - remove unused param of select_backend()

[openldap] / servers / slapd / bconfig.c

diff --git a/servers/slapd/bconfig.c b/servers/slapd/bconfig.c
index d157296d606de0e63a0f2eb28c3f21779ae77020..94bb341727ccc48c93fee9d93dba779625c2c763 100644 (file)
--- a/servers/slapd/bconfig.c
+++ b/servers/slapd/bconfig.c
@@ -795,7 +795,6 @@ config_generic(ConfigArgs *c) {
                        if ( c->be->be_limits ) {
                                char buf[4096*3];
                                struct berval bv;
-                               int i;
 
                                for ( i=0; c->be->be_limits[i]; i++ ) {
                                        bv.bv_len = snprintf( buf, sizeof( buf ), SLAP_X_ORDERED_FMT, i );
@@ -1089,7 +1088,6 @@ config_generic(ConfigArgs *c) {
                        break;
 
                case CFG_SERVERID: {
-                       int i;
                        ServerID *si, **sip;
 
                        for ( i=0, si = sid_list, sip = &sid_list;
@@ -1151,7 +1149,6 @@ config_generic(ConfigArgs *c) {
                                cfn->c_oc_head = cfn->c_oc_tail = NULL;
                        } else {
                                ObjectClass *oc, *prev = NULL;
-                               int i;
 
                                for ( i=0, oc=cfn->c_oc_head; i<c->valx; i++) {
                                        prev = oc;
@@ -1186,7 +1183,6 @@ config_generic(ConfigArgs *c) {
                                cfn->c_at_head = cfn->c_at_tail = NULL;
                        } else {
                                AttributeType *at, *prev = NULL;
-                               int i;
 
                                for ( i=0, at=cfn->c_at_head; i<c->valx; i++) {
                                        prev = at;
@@ -2121,7 +2117,7 @@ config_suffix(ConfigArgs *c)
        if (SLAP_DBHIDDEN( c->be ))
                tbe = NULL;
        else
-               tbe = select_backend(&ndn, 0, 0);
+               tbe = select_backend(&ndn, 0);
        if(tbe == c->be) {
                Debug( LDAP_DEBUG_ANY, "%s: suffix already served by this backend!.\n",
                        c->log, 0, 0);
@@ -2206,7 +2202,7 @@ config_rootpw(ConfigArgs *c) {
                return 0;
        }
 
-       tbe = select_backend(&c->be->be_rootndn, 0, 0);
+       tbe = select_backend(&c->be->be_rootndn, 0);
        if(tbe != c->be) {
                snprintf( c->msg, sizeof( c->msg ), "<%s> can only be set when rootdn is under suffix",
                        c->argv[0] );
@@ -2449,7 +2445,7 @@ int
 slap_loglevel_get( struct berval *s, int *l )
 {
        int             rc;
-       unsigned long   i;
+       unsigned        i;
        slap_mask_t     m;
 
        if ( loglevel_ops == NULL ) {
@@ -2460,19 +2456,17 @@ slap_loglevel_get( struct berval *s, int *l )
                m |= loglevel_ops[ i ].mask;
        }
 
-       m = ~m;
-
-       for ( i = 1; i <= ( 1 << ( sizeof( int ) * 8 - 1 ) ) && !( m & i ); i <<= 1 )
+       for ( i = 1; m & i; i <<= 1 )
                ;
 
-       if ( !( m & i ) ) {
+       if ( i == 0 ) {
                return -1;
        }
 
        rc = slap_verbmasks_append( &loglevel_ops, i, s, loglevel_ignore );
 
        if ( rc != 0 ) {
-               Debug( LDAP_DEBUG_ANY, "slap_loglevel_get(%lu, \"%s\") failed\n",
+               Debug( LDAP_DEBUG_ANY, "slap_loglevel_get(%u, \"%s\") failed\n",
                        i, s->bv_val, 0 );
 
        } else {
@@ -3128,8 +3122,8 @@ config_setup_ldif( BackendDB *be, const char *dir, int readit ) {
                void *thrctx = ldap_pvt_thread_pool_context();
                int prev_DN_strict;
 
-               op = (Operation *) &opbuf;
-               connection_fake_init( &conn, op, thrctx );
+               connection_fake_init( &conn, &opbuf, thrctx );
+               op = &opbuf.ob_op;
 
                filter.f_desc = slap_schema.si_ad_objectClass;
 
@@ -5420,8 +5414,8 @@ config_back_db_open( BackendDB *be )
        }
 
        thrctx = ldap_pvt_thread_pool_context();
-       op = (Operation *) &opbuf;
-       connection_fake_init( &conn, op, thrctx );
+       connection_fake_init( &conn, &opbuf, thrctx );
+       op = &opbuf.ob_op;
 
        op->o_tag = LDAP_REQ_ADD;
        op->o_callback = &cb;
@@ -5802,9 +5796,9 @@ config_tool_entry_put( BackendDB *be, Entry *e, struct berval *text )
                                        ca.bi->bi_type);
                                ce = config_build_entry( NULL, NULL, cfb->cb_root, &ca, &rdn,
                                                &CFOC_DATABASE, ca.be->be_cf_ocs );
-                               op = (Operation *) &opbuf;
                                thrctx = ldap_pvt_thread_pool_context();
-                               connection_fake_init2( &conn, op, thrctx,0 );
+                               connection_fake_init2( &conn, &opbuf, thrctx,0 );
+                               op = &opbuf.ob_op;
                                op->o_bd = &cfb->cb_db;
                                op->o_tag = LDAP_REQ_ADD;
                                op->ora_e = ce;
@@ -5854,8 +5848,8 @@ config_tool_entry_put( BackendDB *be, Entry *e, struct berval *text )
                                                ca.be->be_cf_ocs );
                                if ( ! op ) {
                                        thrctx = ldap_pvt_thread_pool_context();
-                                       op = (Operation *) &opbuf;
-                                       connection_fake_init2( &conn, op, thrctx,0 );
+                                       connection_fake_init2( &conn, &opbuf, thrctx,0 );
+                                       op = &opbuf.ob_op;
                                        op->o_bd = &cfb->cb_db;
                                        op->o_tag = LDAP_REQ_ADD;
                                        op->o_dn = be->be_rootdn;