Commit c41a151d authored by Howard Chu's avatar Howard Chu
Browse files

Cleanup

parent 0af1940f
......@@ -258,9 +258,8 @@ int bdb_entry_release(
#endif
}
/* free entry and reader or writer lock */
if ( op ) {
boi = (struct bdb_op_info *)op->o_private;
}
boi = (struct bdb_op_info *)op->o_private;
/* lock is freed with txn */
if ( !boi || boi->boi_txn ) {
bdb_unlocked_cache_return_entry_rw( &bdb->bi_cache, e, rw );
......
......@@ -179,7 +179,7 @@ dup_comp_ref ( Operation* op, ComponentReference* cr )
ci_curr = ci_curr->ci_next, ci_temp = &(*ci_temp)->ci_next )
{
*ci_temp = op->o_tmpalloc( sizeof( ComponentId ), op->o_tmpmemctx );
if ( !ci_temp ) return NULL;
if ( !*ci_temp ) return NULL;
**ci_temp = *ci_curr;
}
......
......@@ -437,8 +437,6 @@ static Connection* connection_get( ber_socket_t s )
assert( MCA_conn_check( s ) );
c = MCA_GET_CONNECTION(s);
assert( c->c_struct_state != SLAP_C_UNINITIALIZED );
#else
c = NULL;
{
......@@ -475,6 +473,8 @@ static Connection* connection_get( ber_socket_t s )
if( c != NULL ) {
ber_socket_t sd;
assert( c->c_struct_state != SLAP_C_UNINITIALIZED );
ldap_pvt_thread_mutex_lock( &c->c_mutex );
ber_sockbuf_ctrl( c->c_sb, LBER_SB_OPT_GET_FD, &sd );
......
......@@ -398,7 +398,7 @@ replog1(
fprintf( fp, "%s: %s\n", did, type );
first = 0;
}
vals[0] = a->a_nvals[i];
vals[0] = ml->sml_values[i];
print_vals( fp, &ml->sml_desc->ad_cname, vals );
ocs = 2;
}
......
......@@ -236,7 +236,7 @@ int value_find_ex(
{
rc = (mr->smr_normalize)(
flags & (SLAP_MR_TYPE_MASK|SLAP_MR_SUBTYPE_MASK|SLAP_MR_VALUE_OF_SYNTAX),
ad ? ad->ad_type->sat_syntax : NULL,
ad->ad_type->sat_syntax,
mr, val, &nval, ctx );
if( rc != LDAP_SUCCESS ) {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment