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

diff --git a/libraries/libldap/add.c b/libraries/libldap/add.c
index bba85be474143db516991717b543aea4024cabeb..cf5ffa1b98e1fa3495431e61a9dd4330a2ee7097 100644 (file)
--- a/libraries/libldap/add.c
+++ b/libraries/libldap/add.c
@@ -207,7 +207,7 @@ ldap_add_ext(
        int     *msgidp )
 {
        BerElement      *ber;
-       int             i, rc;
+       int             rc;
        ber_int_t       id;
 
        Debug( LDAP_DEBUG_TRACE, "ldap_add_ext\n", 0, 0, 0 );

diff --git a/libraries/libldap/extended.c b/libraries/libldap/extended.c
index 1a745515a57362c8ce6baddff6e3cc35365cb83d..05084b0ae8de84df9a29ce8c88bafbe6e9317542 100644 (file)
--- a/libraries/libldap/extended.c
+++ b/libraries/libldap/extended.c
@@ -103,7 +103,6 @@ ldap_extended_operation(
        int                             *msgidp )
 {
        BerElement *ber;
-       int rc;
        ber_int_t id;
 
        Debug( LDAP_DEBUG_TRACE, "ldap_extended_operation\n", 0, 0, 0 );

diff --git a/libraries/libldap/modify.c b/libraries/libldap/modify.c
index 8e189b0b3cc5cf5128588b7d01b72d3c85515a47..e5ea2197a17667439db6827cd7db9a0d8281652b 100644 (file)
--- a/libraries/libldap/modify.c
+++ b/libraries/libldap/modify.c
@@ -152,7 +152,7 @@ ldap_modify_ext( LDAP *ld,
        int *msgidp )
 {
        BerElement      *ber;
-       int             i, rc;
+       int             rc;
        ber_int_t       id;
 
        Debug( LDAP_DEBUG_TRACE, "ldap_modify_ext\n", 0, 0, 0 );

diff --git a/libraries/libldap/os-local.c b/libraries/libldap/os-local.c
index e6db521046c0bc2cb9827622dff4580abea7e06a..36d3e97e4e25313133840514155fa83cf078043f 100644 (file)
--- a/libraries/libldap/os-local.c
+++ b/libraries/libldap/os-local.c
@@ -359,5 +359,5 @@ ldap_connect_to_path(LDAP *ld, Sockbuf *sb, LDAPURLDesc *srv, int async)
        return rc;
 }
 #else
-static int dummy;
+static int dummy; /* generate also a warning: 'dummy' defined but not used (at least here) */
 #endif /* LDAP_PF_LOCAL */

diff --git a/servers/slapd/back-ldap/distproc.c b/servers/slapd/back-ldap/distproc.c
index 4d0a58689fac1cfa09599b05c16e05d37e4585a4..a26a1e37269bd1bf5f691026d97363a667a67b72 100644 (file)
--- a/servers/slapd/back-ldap/distproc.c
+++ b/servers/slapd/back-ldap/distproc.c
@@ -211,7 +211,10 @@ static int         sc_returnContRef;
 #define get_returnContRef(op)          ((op)->o_returnContRef & SLAP_CONTROL_MASK)
 
 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 );
+#endif
+
 
 static BackendInfo     *lback;
 

diff --git a/servers/slapd/back-ldif/ldif.c b/servers/slapd/back-ldif/ldif.c
index d538a86a3fd19d0695d8589fa33c9da51b2cfa2b..392c27da1acd06a185ef083a7b570818ef4d6d92 100644 (file)
--- a/servers/slapd/back-ldif/ldif.c
+++ b/servers/slapd/back-ldif/ldif.c
@@ -395,7 +395,6 @@ crc32(const void *vbuf, int len)
 {
        const unsigned char     *buf = vbuf;
        ber_uint_t              crc = 0xffffffff;
-       int                             i;
 
        while (len > 7) {
                CRC8;

diff --git a/servers/slapd/back-mdb/id2entry.c b/servers/slapd/back-mdb/id2entry.c
index 2b569cd39fd9862d1811c955da00936d6dfe5709..e655132a4b15f43e000db832cf98ced7eb0142fc 100644 (file)
--- a/servers/slapd/back-mdb/id2entry.c
+++ b/servers/slapd/back-mdb/id2entry.c
@@ -140,7 +140,6 @@ int mdb_id2entry(
        ID id,
        Entry **e )
 {
-       struct mdb_info *mdb = (struct mdb_info *) op->o_bd->be_private;
        MDB_val key, data;
        int rc = 0;
 
@@ -267,7 +266,6 @@ int mdb_entry_release(
 {
        struct mdb_info *mdb = (struct mdb_info *) op->o_bd->be_private;
        struct mdb_op_info *moi = NULL;
-       int rc;
  
        /* slapMode : SLAP_SERVER_MODE, SLAP_TOOL_MODE,
                        SLAP_TRUNCATE_MODE, SLAP_UNDEFINED_MODE */
@@ -593,8 +591,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)
 {
        struct mdb_info *mdb = (struct mdb_info *) op->o_bd->be_private;
-       ber_len_t len, i;
-       int rc;
+       ber_len_t i;
        Attribute *a;
        unsigned char *ptr;
        unsigned int *lp, l;
@@ -667,7 +664,6 @@ int mdb_entry_decode(Operation *op, MDB_txn *txn, MDB_val *data, Entry **e)
        Attribute *a;
        Entry *x;
        const char *text;
-       AttributeDescription *ad;
        unsigned int *lp = (unsigned int *)data->mv_data;
        unsigned char *ptr;
        BerVarray bptr;

diff --git a/servers/slapd/back-mdb/index.c b/servers/slapd/back-mdb/index.c
index c0dfb2ceb1c86019d3b94ca2e4db91d2ba1ddc6e..ee463b9fbc25ad29449d575f5426efb6e23bf3d8 100644 (file)
--- a/servers/slapd/back-mdb/index.c
+++ b/servers/slapd/back-mdb/index.c
@@ -172,7 +172,7 @@ static int indexer(
        int opid,
        slap_mask_t mask )
 {
-       int rc, i;
+       int rc;
        struct berval *keys;
        MDB_cursor *mc = ai->ai_cursor;
        mdb_idl_keyfunc *keyfunc;

diff --git a/servers/slapd/back-mdb/init.c b/servers/slapd/back-mdb/init.c
index 23ddc997d7d2ea3fc73fe55f7f290ce4f566b4f6..65f95fb8dceb947a61e812a7556fdff25783a238 100644 (file)
--- a/servers/slapd/back-mdb/init.c
+++ b/servers/slapd/back-mdb/init.c
@@ -227,7 +227,6 @@ mdb_db_open( BackendDB *be, ConfigReply *cr )
                else if ( i == MDB_DN2ID ) {
                        MDB_cursor *mc;
                        MDB_val key, data;
-                       ID id;
                        mdb_set_dupsort( txn, mdb->mi_dbis[i], mdb_dup_compare );
                        /* check for old dn2id format */
                        rc = mdb_cursor_open( txn, mdb->mi_dbis[i], &mc );

diff --git a/servers/slapd/back-mdb/monitor.c b/servers/slapd/back-mdb/monitor.c
index 34e182299276def9653288b9adb8b35e687dedae..f7f15ad5d81261bc2caaf818d33dd2e6ce50ee85 100644 (file)
--- a/servers/slapd/back-mdb/monitor.c
+++ b/servers/slapd/back-mdb/monitor.c
@@ -118,9 +118,9 @@ mdb_monitor_update(
        Entry           *e,
        void            *priv )
 {
+#ifdef MDB_MONITOR_IDX
        struct mdb_info         *mdb = (struct mdb_info *) priv;
 
-#ifdef MDB_MONITOR_IDX
        mdb_monitor_idx_entry_add( mdb, e );
 #endif /* MDB_MONITOR_IDX */
 
@@ -259,7 +259,9 @@ mdb_monitor_initialize( void )
 int
 mdb_monitor_db_init( BackendDB *be )
 {
+#ifdef MDB_MONITOR_IDX
        struct mdb_info         *mdb = (struct mdb_info *) be->be_private;
+#endif /* MDB_MONITOR_IDX */
 
        if ( mdb_monitor_initialize() == LDAP_SUCCESS ) {
                /* monitoring in back-mdb is on by default */

diff --git a/servers/slapd/back-mdb/search.c b/servers/slapd/back-mdb/search.c
index 6084c6f0158ad758da08719026a015bbd4b42315..6490242ba7b3df3fb4b08fb6cedb78bb5395222b 100644 (file)
--- a/servers/slapd/back-mdb/search.c
+++ b/servers/slapd/back-mdb/search.c
@@ -292,7 +292,6 @@ static void scope_chunk_free( void *key, void *data )
 
 static ID2 *scope_chunk_get( Operation *op )
 {
-       struct mdb_info *mdb = (struct mdb_info *) op->o_bd->be_private;
        ID2 *ret = NULL;
 
        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 )
 {
-       struct mdb_info *mdb = (struct mdb_info *) op->o_bd->be_private;
        void *ret = NULL;
 
        ldap_pvt_thread_pool_getkey( op->o_threadctx, (void *)scope_chunk_get,

diff --git a/servers/slapd/back-mdb/tools.c b/servers/slapd/back-mdb/tools.c
index 7d1fb7b44e392758cfdd2e7d59f013211b999432..5199ec6f189c91754a343586c2156cc5be1f59d2 100644 (file)
--- a/servers/slapd/back-mdb/tools.c
+++ b/servers/slapd/back-mdb/tools.c
@@ -430,7 +430,6 @@ static int mdb_tool_next_id(
        struct berval *text,
        int hole )
 {
-       struct mdb_info *mdb = (struct mdb_info *) op->o_bd->be_private;
        struct berval dn = e->e_name;
        struct berval ndn = e->e_nname;
        struct berval pdn, npdn, nmatched;
@@ -1319,7 +1318,6 @@ mdb_dn2id_upgrade( BackendDB *be ) {
        MDB_txn *mt;
        MDB_cursor *mc = NULL;
        MDB_val key, data;
-       char *ptr;
        int rc, writes=0, depth=0;
        int enable_meter = 0;
        ID id = 0, *num, count = 0;

diff --git a/servers/slapd/overlays/syncprov.c b/servers/slapd/overlays/syncprov.c
index 4c2d939d456136907186ebc130dca742e2a5ed29..7f0fadd481849e4522d926e532fcd6c804e5d65c 100644 (file)
--- a/servers/slapd/overlays/syncprov.c
+++ b/servers/slapd/overlays/syncprov.c
@@ -917,7 +917,6 @@ syncprov_qstart( syncops *so );
 static int
 syncprov_qplay( Operation *op, syncops *so )
 {
-       slap_overinst *on = LDAP_SLIST_FIRST(&so->s_op->o_extra)->oe_key;
        syncres *sr;
        int rc = 0;
 
@@ -1597,7 +1596,7 @@ syncprov_add_slog( Operation *op )
                }
                sl->sl_num++;
                while ( sl->sl_num > sl->sl_size ) {
-                       int i, j;
+                       int i;
                        se = sl->sl_head;
                        sl->sl_head = se->se_next;
                        for ( i=0; i<sl->sl_numcsns; i++ )

diff --git a/servers/slapd/syncrepl.c b/servers/slapd/syncrepl.c
index 317f001d0b71876be176e4fbfd42f8c4db79f55c..7c0a94eca22bd4bc1bb46d3731a2cca7468b6943 100644 (file)
--- a/servers/slapd/syncrepl.c
+++ b/servers/slapd/syncrepl.c
@@ -2155,11 +2155,8 @@ syncrepl_op_modify( Operation *op, SlapReply *rs )
        if ( match < 0 ) {
                Operation op2 = *op;
                AttributeName an[2];
-               const char *text;
                struct berval bv;
-               char *ptr;
-               Modifications *ml;
-               int size, rc;
+               int size;
                SlapReply rs1 = {0};
                resolve_ctxt rx;
                slap_callback cb = { NULL, syncrepl_resolve_cb, NULL, NULL };

diff --git a/tests/progs/slapd-mtread.c b/tests/progs/slapd-mtread.c
index 45a3f89e3608cc5d88716dda4ffeae31a12075d4..611e108dc35fd6662b76bde1743b22d27ea00a7a 100644 (file)
--- a/tests/progs/slapd-mtread.c
+++ b/tests/progs/slapd-mtread.c
@@ -576,7 +576,7 @@ do_conn( char *uri, char *manager, struct berval *passwd,
 {
        LDAP    *ld = NULL;
        int     version = LDAP_VERSION3;
-       int     i = 0, do_retry = maxretries;
+       int     do_retry = maxretries;
        int     rc = LDAP_SUCCESS;
        char    thrstr[BUFSIZ];
 
@@ -712,7 +712,7 @@ do_random2( LDAP *ld,
        int     rc = LDAP_SUCCESS;
        int             lo, hi, range;
        int     flen;
-       LDAPMessage *res = NULL, *e = NULL;
+       LDAPMessage *res = NULL;
        char    *ptr, *ftail;
        char    thrstr[BUFSIZ];
        char    fbuf[BUFSIZ];