Remove lint (unused vars/labels/funcs/default:s)

diff --git a/contrib/slapd-modules/nssov/pam.c b/contrib/slapd-modules/nssov/pam.c
index 6d6702c67fbdf3acdee7459e72557f4bda9f1203..3a074b3074d142bf40cb994f82e22c7ffe7c57d1 100644 (file)
--- a/contrib/slapd-modules/nssov/pam.c
+++ b/contrib/slapd-modules/nssov/pam.c
@@ -206,7 +206,6 @@ int pam_authc(nssov_info *ni,TFILE *fp,Operation *op)
        int32_t tmpint32;
        int rc;
        slap_callback cb = {0};
-       SlapReply rs = {REP_RESULT};
        char dnc[1024];
        char uidc[32];
        char svcc[256];

diff --git a/contrib/slapd-modules/usn/usn.c b/contrib/slapd-modules/usn/usn.c
index cfb882dfc340a17527c791aed377a4f5e2377060..bbf09c5cbb845170cb8b89c4d1819140e3ddb96b 100644 (file)
--- a/contrib/slapd-modules/usn/usn.c
+++ b/contrib/slapd-modules/usn/usn.c
@@ -233,7 +233,6 @@ usn_db_close(
        void *thrctx;
 
        Modifications mod;
-       SlapReply rsm = { 0 };
        slap_callback cb = {0};
        char intbuf[64];
        struct berval bv[2];

diff --git a/servers/slapd/back-bdb/compare.c b/servers/slapd/back-bdb/compare.c
index 095033eb14419dca83285c50bd706817aae3cdf4..e11c03ea42933c211b3140ed01924a66fb935b59 100644 (file)
--- a/servers/slapd/back-bdb/compare.c
+++ b/servers/slapd/back-bdb/compare.c
@@ -27,7 +27,6 @@ bdb_compare( Operation *op, SlapReply *rs )
        struct bdb_info *bdb = (struct bdb_info *) op->o_bd->be_private;
        Entry           *e = NULL;
        EntryInfo       *ei;
-       Attribute       *a;
        int             manageDSAit = get_manageDSAit( op );
 
        DB_TXN          *rtxn;

diff --git a/servers/slapd/back-bdb/dn2id.c b/servers/slapd/back-bdb/dn2id.c
index dc7132bb8e72d8111f3538cba8b85bf71ce2d131..7de67bfe93778a1c97d3d7b2b2c671e9f2be4d9b 100644 (file)
--- a/servers/slapd/back-bdb/dn2id.c
+++ b/servers/slapd/back-bdb/dn2id.c
@@ -151,7 +151,6 @@ bdb_dn2id_delete(
        DB *db = bdb->bi_dn2id->bdi_db;
        char            *buf;
        DBT             key;
-       DB_LOCK lock;
        struct berval   pdn, ptr;
        int             rc;
 
@@ -614,7 +613,6 @@ hdb_dn2id_delete(
        int rc;
        ID      nid;
        unsigned char dlen[2];
-       DB_LOCK lock;
 
        Debug( LDAP_DEBUG_TRACE, "=> hdb_dn2id_delete 0x%lx: \"%s\"\n",
                e->e_id, e->e_ndn, 0 );

diff --git a/servers/slapd/back-ldap/distproc.c b/servers/slapd/back-ldap/distproc.c
index 8084e7dc643a96844bc1a3a75a42936b2650f089..f64c04621b4ef4464995ab8e23678ebe2da31217 100644 (file)
--- a/servers/slapd/back-ldap/distproc.c
+++ b/servers/slapd/back-ldap/distproc.c
@@ -107,6 +107,7 @@ typedef struct ContinuationReference_t {
 } ContinuationReference_t;
 #define        CR_INIT         { NULL, BER_BVNULL, LDAP_DP_RT_UNKNOWN, BER_BVNULL, LDAP_DP_SS_UNKNOWN, NULL, BER_BVNULL }
 
+#ifdef unused
 static struct berval   bv2rt[] = {
        BER_BVC( "superior" ),
        BER_BVC( "subordinate" ),
@@ -196,6 +197,7 @@ ldap_distproc_str2ss( const char *s )
        ber_str2bv( s, 0, 0, &bv );
        return ldap_distproc_bv2ss( &bv );
 }
+#endif /* unused */
 
 /*
  * NOTE: this overlay assumes that the chainingBehavior control
@@ -239,12 +241,6 @@ static int ldap_distproc_db_init_one( BackendDB *be );
 #define        ldap_distproc_db_close_one(be)          (0)
 #define        ldap_distproc_db_destroy_one(be, ca)    (lback)->bi_db_destroy( (be), (ca) )
 
-static int
-ldap_distproc_parse_ctrl(
-       Operation       *op,
-       SlapReply       *rs,
-       LDAPControl     *ctrl );
-
 static int
 ldap_distproc_uri_cmp( const void *c1, const void *c2 )
 {

diff --git a/servers/slapd/back-monitor/compare.c b/servers/slapd/back-monitor/compare.c
index 8fa2fa4154232e776d7b7b74f9c6cbda097adb8f..c071f6bddfe9985b1544dd06df7ab0a8b8414809 100644 (file)
--- a/servers/slapd/back-monitor/compare.c
+++ b/servers/slapd/back-monitor/compare.c
@@ -31,7 +31,6 @@ monitor_back_compare( Operation *op, SlapReply *rs )
 {
        monitor_info_t  *mi = ( monitor_info_t * ) op->o_bd->be_private;
        Entry           *e, *matched = NULL;
-       Attribute       *a;
        int             rc;
 
        /* get entry with reader lock */
@@ -58,17 +57,12 @@ monitor_back_compare( Operation *op, SlapReply *rs )
        }
 
        rs->sr_err = slap_compare_entry( op, e, op->orc_ava );
-
-return_results:;
        rc = rs->sr_err;
        switch ( rc ) {
        case LDAP_COMPARE_FALSE:
        case LDAP_COMPARE_TRUE:
                rc = LDAP_SUCCESS;
                break;
-
-       default:
-               break;
        }
                
        send_ldap_result( op, rs );

diff --git a/servers/slapd/overlays/memberof.c b/servers/slapd/overlays/memberof.c
index 1f6671ebbb8936b6fc269a63f4a8d702de66b3c7..90d6795bea6c1ee066f0019d239f98e8ae39d674 100644 (file)
--- a/servers/slapd/overlays/memberof.c
+++ b/servers/slapd/overlays/memberof.c
@@ -1186,8 +1186,6 @@ memberof_res_add( Operation *op, SlapReply *rs )
 
                ma = attr_find( op->ora_e->e_attrs, mo->mo_ad_memberof );
                if ( ma != NULL ) {
-                       char relax = op->o_relax;
-
                        /* relax is required to allow to add
                         * a non-existing member */
                        op->o_relax = SLAP_CONTROL_CRITICAL;

diff --git a/servers/slapd/overlays/pcache.c b/servers/slapd/overlays/pcache.c
index ea9820b045e442537de84322b4e9a376cadeaa95..e15b768febab301a0efc6167dfe9ccc393066a04 100644 (file)
--- a/servers/slapd/overlays/pcache.c
+++ b/servers/slapd/overlays/pcache.c
@@ -2616,7 +2616,7 @@ pc_bind_attrs( Operation *op, Entry *e, QueryTemplate *temp,
 {
        int i, len = 0;
        struct berval *vals, pres = BER_BVC("*");
-       char *p1, *p2, *t1;
+       char *p1, *p2;
        Attribute *a;
 
        vals = op->o_tmpalloc( temp->bindnattrs * sizeof( struct berval ),
@@ -3224,7 +3224,6 @@ refresh_merge( Operation *op, SlapReply *rs )
 {
        if ( rs->sr_type == REP_SEARCH ) {
                refresh_info *ri = op->o_callback->sc_private;
-               BackendDB *be = op->o_bd;
                Entry *e;
                dnlist *dnl;
                slap_callback *ocb;

diff --git a/servers/slapd/overlays/rwm.c b/servers/slapd/overlays/rwm.c
index 4fe78e6e8b174ca38c0cbe10056c066738258965..54dc366c3a6d05cf93d3b548b141a282f3f9d4fe 100644 (file)
--- a/servers/slapd/overlays/rwm.c
+++ b/servers/slapd/overlays/rwm.c
@@ -866,12 +866,7 @@ rwm_entry_get_rw( Operation *op, struct berval *ndn,
        ObjectClass *oc, AttributeDescription *at, int rw, Entry **ep )
 {
        slap_overinst           *on = (slap_overinst *) op->o_bd->bd_info;
-       struct ldaprwmap        *rwmap = 
-                       (struct ldaprwmap *)on->on_bi.bi_private;
-
        int                     rc;
-       dncookie                dc;
-
        BackendDB               db;
        Operation               op2;
        SlapReply               rs = { REP_SEARCH };
@@ -2036,6 +2031,7 @@ rwm_bva_rewrite_add(
        return rwm_bva_add( &rwmap->rwm_bva_rewrite, idx, argv );
 }
 
+#ifdef unused
 static int
 rwm_bva_map_add(
        struct ldaprwmap        *rwmap,
@@ -2044,6 +2040,7 @@ rwm_bva_map_add(
 {
        return rwm_bva_add( &rwmap->rwm_bva_map, idx, argv );
 }
+#endif /* unused */
 
 static int
 rwm_info_init( struct rewrite_info ** rwm_rw )

diff --git a/servers/slapd/overlays/syncprov.c b/servers/slapd/overlays/syncprov.c
index 72730c0686d96c2a603fd374754494f62bf311ca..911631ac58b730f5b82f68061853f28af7b54011 100644 (file)
--- a/servers/slapd/overlays/syncprov.c
+++ b/servers/slapd/overlays/syncprov.c
@@ -818,8 +818,6 @@ syncprov_free_syncop( syncops *so )
 static int
 syncprov_sendresp( Operation *op, opcookie *opc, syncops *so, int mode )
 {
-       slap_overinst *on = opc->son;
-
        SlapReply rs = { REP_SEARCH };
        LDAPControl *ctrls[2];
        struct berval cookie = BER_BVNULL, csns[2];
@@ -915,7 +913,6 @@ syncprov_qplay( Operation *op, syncops *so )
 {
        slap_overinst *on = LDAP_SLIST_FIRST(&so->s_op->o_extra)->oe_key;
        syncres *sr;
-       Entry *e;
        opcookie opc;
        int rc = 0;
 
@@ -1377,7 +1374,7 @@ syncprov_op_cleanup( Operation *op, SlapReply *rs )
        slap_overinst *on = opc->son;
        syncprov_info_t         *si = on->on_bi.bi_private;
        syncmatches *sm, *snext;
-       modtarget *mt, mtdummy;
+       modtarget *mt;
 
        ldap_pvt_thread_mutex_lock( &si->si_ops_mutex );
        if ( si->si_active )

diff --git a/servers/slapd/overlays/translucent.c b/servers/slapd/overlays/translucent.c
index 63f283c009153915b78e2191bfe2df6f7853864f..d4d77b2551822c5d9d25ec329ea539fe8d5322c7 100644 (file)
--- a/servers/slapd/overlays/translucent.c
+++ b/servers/slapd/overlays/translucent.c
@@ -724,8 +724,6 @@ static int translucent_pwmod(Operation *op, SlapReply *rs) {
 }
 
 static int translucent_exop(Operation *op, SlapReply *rs) {
-       SlapReply nrs = { REP_RESULT };
-
        slap_overinst *on = (slap_overinst *) op->o_bd->bd_info;
        translucent_info *ov = on->on_bi.bi_private;
        const struct berval bv_exop_pwmod = BER_BVC(LDAP_EXOP_MODIFY_PASSWD);

diff --git a/servers/slapd/syncrepl.c b/servers/slapd/syncrepl.c
index 214e2c6fb87de33ea4a983667f1ffc1ad1eb41a1..0036638ff4ead3545a572318fc8d439da05c4401 100644 (file)
--- a/servers/slapd/syncrepl.c
+++ b/servers/slapd/syncrepl.c
@@ -3587,7 +3587,6 @@ dn_callback(
                         * in the provider are always propagated.
                         */
                        if ( dni->new_entry ) {
-                               Modifications **modtail, **ml;
                                Attribute *old, *new;
                                struct berval old_rdn, new_rdn;
                                struct berval old_p, new_p;