upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-20 22:59:34 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

ITS#8578 - remove unused-variables in RE24 testing call (2.4.45)

Browse source
This commit is contained in:
sca+openldap@andreasschulze.de 2017-09-01 16:31:52 -07:00 committed by Quanah Gibson-Mount
parent da170cbe3b
commit 90835da72f
15 changed files with 15 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/libldap/add.c
View file

@ -207,7 +207,7 @@ ldap_add_ext(
int *msgidp ) int *msgidp )
{ {
BerElement *ber; BerElement *ber;
int i, rc; int rc;
ber_int_t id; ber_int_t id;
Debug( LDAP_DEBUG_TRACE, "ldap_add_ext\n", 0, 0, 0 ); Debug( LDAP_DEBUG_TRACE, "ldap_add_ext\n", 0, 0, 0 );

1
libraries/libldap/extended.c
View file

@ -103,7 +103,6 @@ ldap_extended_operation(
int *msgidp ) int *msgidp )
{ {
BerElement *ber; BerElement *ber;
int rc;
ber_int_t id; ber_int_t id;
Debug( LDAP_DEBUG_TRACE, "ldap_extended_operation\n", 0, 0, 0 ); Debug( LDAP_DEBUG_TRACE, "ldap_extended_operation\n", 0, 0, 0 );

2
libraries/libldap/modify.c
View file

@ -152,7 +152,7 @@ ldap_modify_ext( LDAP *ld,
int *msgidp ) int *msgidp )
{ {
BerElement *ber; BerElement *ber;
int i, rc; int rc;
ber_int_t id; ber_int_t id;
Debug( LDAP_DEBUG_TRACE, "ldap_modify_ext\n", 0, 0, 0 ); Debug( LDAP_DEBUG_TRACE, "ldap_modify_ext\n", 0, 0, 0 );

2
libraries/libldap/os-local.c
View file

@ -359,5 +359,5 @@ ldap_connect_to_path(LDAP *ld, Sockbuf *sb, LDAPURLDesc *srv, int async)
return rc; return rc;
} }
#else #else
static int dummy; static int dummy; /* generate also a warning: 'dummy' defined but not used (at least here) */
#endif /* LDAP_PF_LOCAL */ #endif /* LDAP_PF_LOCAL */

3
servers/slapd/back-ldap/distproc.c
View file

@ -211,7 +211,10 @@ static int sc_returnContRef;
#define get_returnContRef(op) ((op)->o_returnContRef & SLAP_CONTROL_MASK) #define get_returnContRef(op) ((op)->o_returnContRef & SLAP_CONTROL_MASK)
static struct berval slap_EXOP_CHAINEDREQUEST = BER_BVC( LDAP_EXOP_X_CHAINEDREQUEST ); static struct berval slap_EXOP_CHAINEDREQUEST = BER_BVC( LDAP_EXOP_X_CHAINEDREQUEST );
#ifdef LDAP_DEVEL
static struct berval slap_FEATURE_CANCHAINOPS = BER_BVC( LDAP_FEATURE_X_CANCHAINOPS ); static struct berval slap_FEATURE_CANCHAINOPS = BER_BVC( LDAP_FEATURE_X_CANCHAINOPS );
#endif
static BackendInfo *lback; static BackendInfo *lback;

1
servers/slapd/back-ldif/ldif.c
View file

@ -395,7 +395,6 @@ crc32(const void *vbuf, int len)
{ {
const unsigned char *buf = vbuf; const unsigned char *buf = vbuf;
ber_uint_t crc = 0xffffffff; ber_uint_t crc = 0xffffffff;
int i;
while (len > 7) { while (len > 7) {
CRC8; CRC8;

6
servers/slapd/back-mdb/id2entry.c
View file

@ -384,7 +384,6 @@ int mdb_id2entry(
ID id, ID id,
Entry **e ) Entry **e )
{ {
struct mdb_info *mdb = (struct mdb_info *) op->o_bd->be_private;
MDB_val key, data; MDB_val key, data;
int rc = 0; int rc = 0;
@ -534,7 +533,6 @@ int mdb_entry_release(
{ {
struct mdb_info *mdb = (struct mdb_info *) op->o_bd->be_private; struct mdb_info *mdb = (struct mdb_info *) op->o_bd->be_private;
struct mdb_op_info *moi = NULL; struct mdb_op_info *moi = NULL;
int rc;
/* slapMode : SLAP_SERVER_MODE, SLAP_TOOL_MODE, /* slapMode : SLAP_SERVER_MODE, SLAP_TOOL_MODE,
SLAP_TRUNCATE_MODE, SLAP_UNDEFINED_MODE */ SLAP_TRUNCATE_MODE, SLAP_UNDEFINED_MODE */
@ -924,8 +922,7 @@ static int mdb_entry_partsize(struct mdb_info *mdb, MDB_txn *txn, Entry *e,
static int mdb_entry_encode(Operation *op, Entry *e, MDB_val *data, Ecount *eh) static int mdb_entry_encode(Operation *op, Entry *e, MDB_val *data, Ecount *eh)
{ {
struct mdb_info *mdb = (struct mdb_info *) op->o_bd->be_private; struct mdb_info *mdb = (struct mdb_info *) op->o_bd->be_private;
ber_len_t len, i; ber_len_t i;
int rc;
Attribute *a; Attribute *a;
unsigned char *ptr; unsigned char *ptr;
unsigned int *lp, l; unsigned int *lp, l;
@ -1004,7 +1001,6 @@ int mdb_entry_decode(Operation *op, MDB_txn *txn, MDB_val *data, ID id, Entry **
Attribute *a; Attribute *a;
Entry *x; Entry *x;
const char *text; const char *text;
AttributeDescription *ad;
unsigned int *lp = (unsigned int *)data->mv_data; unsigned int *lp = (unsigned int *)data->mv_data;
unsigned char *ptr; unsigned char *ptr;
BerVarray bptr; BerVarray bptr;

2
servers/slapd/back-mdb/index.c
View file

@ -172,7 +172,7 @@ static int indexer(
int opid, int opid,
slap_mask_t mask ) slap_mask_t mask )
{ {
int rc, i; int rc;
struct berval *keys; struct berval *keys;
MDB_cursor *mc = ai->ai_cursor; MDB_cursor *mc = ai->ai_cursor;
mdb_idl_keyfunc *keyfunc; mdb_idl_keyfunc *keyfunc;

1
servers/slapd/back-mdb/init.c
View file

@ -235,7 +235,6 @@ mdb_db_open( BackendDB *be, ConfigReply *cr )
} else if ( i == MDB_DN2ID ) { } else if ( i == MDB_DN2ID ) {
MDB_cursor *mc; MDB_cursor *mc;
MDB_val key, data; MDB_val key, data;
ID id;
mdb_set_dupsort( txn, mdb->mi_dbis[i], mdb_dup_compare ); mdb_set_dupsort( txn, mdb->mi_dbis[i], mdb_dup_compare );
/* check for old dn2id format */ /* check for old dn2id format */
rc = mdb_cursor_open( txn, mdb->mi_dbis[i], &mc ); rc = mdb_cursor_open( txn, mdb->mi_dbis[i], &mc );

4
servers/slapd/back-mdb/monitor.c
View file

@ -118,9 +118,9 @@ mdb_monitor_update(
Entry *e, Entry *e,
void *priv ) void *priv )
{ {
#ifdef MDB_MONITOR_IDX
struct mdb_info *mdb = (struct mdb_info *) priv; struct mdb_info *mdb = (struct mdb_info *) priv;
#ifdef MDB_MONITOR_IDX
mdb_monitor_idx_entry_add( mdb, e ); mdb_monitor_idx_entry_add( mdb, e );
#endif /* MDB_MONITOR_IDX */ #endif /* MDB_MONITOR_IDX */
@ -259,7 +259,9 @@ mdb_monitor_initialize( void )
int int
mdb_monitor_db_init( BackendDB *be ) mdb_monitor_db_init( BackendDB *be )
{ {
#ifdef MDB_MONITOR_IDX
struct mdb_info *mdb = (struct mdb_info *) be->be_private; struct mdb_info *mdb = (struct mdb_info *) be->be_private;
#endif /* MDB_MONITOR_IDX */
if ( mdb_monitor_initialize() == LDAP_SUCCESS ) { if ( mdb_monitor_initialize() == LDAP_SUCCESS ) {
/* monitoring in back-mdb is on by default */ /* monitoring in back-mdb is on by default */

2
servers/slapd/back-mdb/search.c
View file

@ -292,7 +292,6 @@ static void scope_chunk_free( void *key, void *data )
static ID2 *scope_chunk_get( Operation *op ) static ID2 *scope_chunk_get( Operation *op )
{ {
struct mdb_info *mdb = (struct mdb_info *) op->o_bd->be_private;
ID2 *ret = NULL; ID2 *ret = NULL;
ldap_pvt_thread_pool_getkey( op->o_threadctx, (void *)scope_chunk_get, ldap_pvt_thread_pool_getkey( op->o_threadctx, (void *)scope_chunk_get,
@ -309,7 +308,6 @@ static ID2 *scope_chunk_get( Operation *op )
static void scope_chunk_ret( Operation *op, ID2 *scopes ) static void scope_chunk_ret( Operation *op, ID2 *scopes )
{ {
struct mdb_info *mdb = (struct mdb_info *) op->o_bd->be_private;
void *ret = NULL; void *ret = NULL;
ldap_pvt_thread_pool_getkey( op->o_threadctx, (void *)scope_chunk_get, ldap_pvt_thread_pool_getkey( op->o_threadctx, (void *)scope_chunk_get,

2
servers/slapd/back-mdb/tools.c
View file

@ -453,7 +453,6 @@ static int mdb_tool_next_id(
struct berval *text, struct berval *text,
int hole ) int hole )
{ {
struct mdb_info *mdb = (struct mdb_info *) op->o_bd->be_private;
struct berval dn = e->e_name; struct berval dn = e->e_name;
struct berval ndn = e->e_nname; struct berval ndn = e->e_nname;
struct berval pdn, npdn, nmatched; struct berval pdn, npdn, nmatched;
@ -1517,7 +1516,6 @@ mdb_dn2id_upgrade( BackendDB *be ) {
MDB_txn *mt; MDB_txn *mt;
MDB_cursor *mc = NULL; MDB_cursor *mc = NULL;
MDB_val key, data; MDB_val key, data;
char *ptr;
int rc, writes=0, depth=0; int rc, writes=0, depth=0;
int enable_meter = 0; int enable_meter = 0;
ID id = 0, *num, count = 0; ID id = 0, *num, count = 0;

3
servers/slapd/overlays/syncprov.c
View file

@ -917,7 +917,6 @@ syncprov_qstart( syncops *so );
static int static int
syncprov_qplay( Operation *op, syncops *so ) syncprov_qplay( Operation *op, syncops *so )
{ {
slap_overinst *on = LDAP_SLIST_FIRST(&so->s_op->o_extra)->oe_key;
syncres *sr; syncres *sr;
int rc = 0; int rc = 0;
@ -1597,7 +1596,7 @@ syncprov_add_slog( Operation *op )
} }
sl->sl_num++; sl->sl_num++;
while ( sl->sl_num > sl->sl_size ) { while ( sl->sl_num > sl->sl_size ) {
int i, j; int i;
se = sl->sl_head; se = sl->sl_head;
sl->sl_head = se->se_next; sl->sl_head = se->se_next;
for ( i=0; i<sl->sl_numcsns; i++ ) for ( i=0; i<sl->sl_numcsns; i++ )

5
servers/slapd/syncrepl.c
View file

@ -2188,11 +2188,8 @@ syncrepl_op_modify( Operation *op, SlapReply *rs )
if ( match < 0 ) { if ( match < 0 ) {
Operation op2 = *op; Operation op2 = *op;
AttributeName an[2]; AttributeName an[2];
const char *text;
struct berval bv; struct berval bv;
char *ptr; int size;
Modifications *ml;
int size, rc;
SlapReply rs1 = {0}; SlapReply rs1 = {0};
resolve_ctxt rx; resolve_ctxt rx;
slap_callback cb = { NULL, syncrepl_resolve_cb, NULL, NULL }; slap_callback cb = { NULL, syncrepl_resolve_cb, NULL, NULL };

4
tests/progs/slapd-mtread.c
View file

@ -576,7 +576,7 @@ do_conn( char *uri, char *manager, struct berval *passwd,
{ {
LDAP *ld = NULL; LDAP *ld = NULL;
int version = LDAP_VERSION3; int version = LDAP_VERSION3;
int i = 0, do_retry = maxretries; int do_retry = maxretries;
int rc = LDAP_SUCCESS; int rc = LDAP_SUCCESS;
char thrstr[BUFSIZ]; char thrstr[BUFSIZ];
@ -712,7 +712,7 @@ do_random2( LDAP *ld,
int rc = LDAP_SUCCESS; int rc = LDAP_SUCCESS;
int lo, hi, range; int lo, hi, range;
int flen; int flen;
LDAPMessage *res = NULL, *e = NULL; LDAPMessage *res = NULL;
char *ptr, *ftail; char *ptr, *ftail;
char thrstr[BUFSIZ]; char thrstr[BUFSIZ];
char fbuf[BUFSIZ]; char fbuf[BUFSIZ];