silence warnings

This commit is contained in:
Pierangelo Masarati 2008-09-16 14:44:24 +00:00
parent 43ae03fc10
commit dc414747a7
8 changed files with 6 additions and 15 deletions

View File

@ -620,7 +620,6 @@ hdb_dn2id_add(
} }
} }
func_leave:
op->o_tmpfree( d, op->o_tmpmemctx ); op->o_tmpfree( d, op->o_tmpmemctx );
Debug( LDAP_DEBUG_TRACE, "<= hdb_dn2id_add 0x%lx: %d\n", e->e_id, rc, 0 ); Debug( LDAP_DEBUG_TRACE, "<= hdb_dn2id_add 0x%lx: %d\n", e->e_id, rc, 0 );

View File

@ -241,7 +241,6 @@ ID bdb_tool_dn2id_get(
Entry* bdb_tool_entry_get( BackendDB *be, ID id ) Entry* bdb_tool_entry_get( BackendDB *be, ID id )
{ {
struct bdb_info *bdb = (struct bdb_info *) be->be_private;
Entry *e = NULL; Entry *e = NULL;
char *dptr; char *dptr;
int rc, eoff; int rc, eoff;
@ -298,6 +297,7 @@ Entry* bdb_tool_entry_get( BackendDB *be, ID id )
e->e_id = id; e->e_id = id;
#ifdef BDB_HIER #ifdef BDB_HIER
if ( slapMode & SLAP_TOOL_READONLY ) { if ( slapMode & SLAP_TOOL_READONLY ) {
struct bdb_info *bdb = (struct bdb_info *) be->be_private;
EntryInfo *ei = NULL; EntryInfo *ei = NULL;
Operation op = {0}; Operation op = {0};
Opheader ohdr = {0}; Opheader ohdr = {0};

View File

@ -233,14 +233,10 @@ ldap_back_db_open( BackendDB *be, ConfigReply *cr )
if ( rc != 0 ) { if ( rc != 0 ) {
/* ignore by now */ /* ignore by now */
rc = 0; rc = 0;
#if 0
goto fail;
#endif
} }
li->li_flags |= LDAP_BACK_F_ISOPEN; li->li_flags |= LDAP_BACK_F_ISOPEN;
fail:;
return rc; return rc;
} }

View File

@ -1107,7 +1107,7 @@ void
overlay_remove( BackendDB *be, slap_overinst *on ) overlay_remove( BackendDB *be, slap_overinst *on )
{ {
slap_overinfo *oi = on->on_info; slap_overinfo *oi = on->on_info;
slap_overinst **oidx, *on2; slap_overinst **oidx;
/* remove overlay from oi_list an call db_close and db_destroy /* remove overlay from oi_list an call db_close and db_destroy
* handlers */ * handlers */

View File

@ -5236,8 +5236,6 @@ config_back_delete( Operation *op, SlapReply *rs )
CfBackInfo *cfb; CfBackInfo *cfb;
CfEntryInfo *ce, *last, *ce2; CfEntryInfo *ce, *last, *ce2;
slap_mask_t mask;
cfb = (CfBackInfo *)op->o_bd->be_private; cfb = (CfBackInfo *)op->o_bd->be_private;
ce = config_find_base( cfb->cb_root, &op->o_req_ndn, &last ); ce = config_find_base( cfb->cb_root, &op->o_req_ndn, &last );
@ -5249,7 +5247,7 @@ config_back_delete( Operation *op, SlapReply *rs )
rs->sr_err = LDAP_UNWILLING_TO_PERFORM; rs->sr_err = LDAP_UNWILLING_TO_PERFORM;
} else if ( ce->ce_type == Cft_Overlay || ce->ce_type == Cft_Database ){ } else if ( ce->ce_type == Cft_Overlay || ce->ce_type == Cft_Database ){
char *iptr; char *iptr;
int count, ixold, rc; int count, ixold;
ldap_pvt_thread_pool_pause( &connection_pool ); ldap_pvt_thread_pool_pause( &connection_pool );

View File

@ -31,6 +31,8 @@
#include "slap.h" #include "slap.h"
#include "config.h" #include "config.h"
#include "lutil.h"
/* This is a cheap hack to implement a collective attribute. /* This is a cheap hack to implement a collective attribute.
* *
* This demonstration overlay looks for a specified attribute in an * This demonstration overlay looks for a specified attribute in an
@ -266,7 +268,7 @@ collect_modify( Operation *op, SlapReply *rs)
collect_info *ci = on->on_bi.bi_private; collect_info *ci = on->on_bi.bi_private;
Modifications *ml; Modifications *ml;
char errMsg[100]; char errMsg[100];
int rc, idx; int idx;
for ( ml = op->orm_modlist; ml != NULL; ml = ml->sml_next) { for ( ml = op->orm_modlist; ml != NULL; ml = ml->sml_next) {
for (; ci; ci=ci->ci_next ) { for (; ci; ci=ci->ci_next ) {

View File

@ -498,7 +498,6 @@ static int
constraint_add( Operation *op, SlapReply *rs ) constraint_add( Operation *op, SlapReply *rs )
{ {
slap_overinst *on = (slap_overinst *) op->o_bd->bd_info; slap_overinst *on = (slap_overinst *) op->o_bd->bd_info;
Backend *be = op->o_bd;
Attribute *a; Attribute *a;
constraint *c = on->on_bi.bi_private, *cp; constraint *c = on->on_bi.bi_private, *cp;
BerVarray b = NULL; BerVarray b = NULL;

View File

@ -393,9 +393,6 @@ static struct berval generic_filterstr = BER_BVC("(objectclass=*)");
static int static int
syncprov_findbase( Operation *op, fbase_cookie *fc ) syncprov_findbase( Operation *op, fbase_cookie *fc )
{ {
opcookie *opc = op->o_callback->sc_private;
slap_overinst *on = opc->son;
/* Use basic parameters from syncrepl search, but use /* Use basic parameters from syncrepl search, but use
* current op's threadctx / tmpmemctx * current op's threadctx / tmpmemctx
*/ */