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

Silence "unused <something>" warnings

Browse source
This commit is contained in:
Hallvard Furuseth 2005-07-14 19:52:08 +00:00
parent 8dddff803e
commit d6cc947561
25 changed files with 28 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
servers/slapd/abandon.c
View file

@ -36,7 +36,6 @@ do_abandon( Operation *op, SlapReply *rs )
{
ber_int_t id;
Operation *o;
int i;
Debug( LDAP_DEBUG_TRACE, "do_abandon\n", 0, 0, 0 );

2
servers/slapd/ad.c
View file

@ -990,8 +990,6 @@ file2anlist( AttributeName *an, const char *fname, const char *brkstr )
}
while ( fgets( lcur, LBUFSIZ, fp ) != NULL ) {
char *str, *s, *next;
const char *delimstr = brkstr;
if ( ( c = strchr( lcur, '\n' ) ) ) {
if ( c == line ) {
*c = '\0';

8
servers/slapd/back-bdb/cache.c
View file

@ -884,9 +884,11 @@ bdb_cache_add(
u_int32_t locker )
{
EntryInfo *new, ei;
struct berval rdn = e->e_name;
DB_LOCK lock;
int rc;
#ifdef BDB_HIER
struct berval rdn = e->e_name;
#endif
ei.bei_id = e->e_id;
ei.bei_parent = eip;
@ -981,8 +983,10 @@ bdb_cache_modrdn(
DB_LOCK *lock )
{
EntryInfo *ei = BEI(e), *pei;
struct berval rdn;
int rc;
#ifdef BDB_HIER
struct berval rdn;
#endif
/* Get write lock on data */
rc = bdb_cache_entry_db_relock( bdb->bi_dbenv, locker, ei, 1, 0, lock );

2
servers/slapd/back-bdb/config.c
View file

@ -263,7 +263,7 @@ bdb_online_index( void *ctx, void *arg )
id++;
getnext = 1;
}
out:
ldap_pvt_thread_mutex_lock( &slapd_rq.rq_mutex );
ldap_pvt_runqueue_stoptask( &slapd_rq, rtask );
bdb->bi_index_task = NULL;

3
servers/slapd/back-bdb/dn2id.c
View file

@ -555,7 +555,7 @@ hdb_dn2id_delete(
DBT key, data;
DBC *cursor;
diskNode *d;
int rc, nrlen;
int rc;
ID nid;
unsigned char dlen[2];
@ -705,7 +705,6 @@ hdb_dn2id_parent(
int rc = 0;
diskNode *d;
char *ptr;
unsigned char *pt2;
ID nid;
DBTzero(&key);

2
servers/slapd/back-bdb/idl.c
View file

@ -1212,8 +1212,6 @@ ID bdb_idl_next( ID *ids, ID *cursor )
*/
int bdb_idl_append_one( ID *ids, ID id )
{
unsigned x;
if (BDB_IDL_IS_RANGE( ids )) {
/* if already in range, treat as a dup */
if (id >= BDB_IDL_FIRST(ids) && id <= BDB_IDL_LAST(ids))

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

@ -389,7 +389,7 @@ bdb_index_entry(
#ifdef LDAP_COMP_MATCH
ComponentReference *cr_list = NULL;
ComponentReference *cr = NULL, *dupped_cr = NULL;
void* decoded_comp, *extracted_comp;
void* decoded_comp;
ComponentSyntaxInfo* csi_attr;
Syntax* syn;
AttributeType* at;

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

@ -246,7 +246,6 @@ bdb_db_recover( BackendDB *be )
return bdb_do_recovery( be );
}
re_exit:
Debug( LDAP_DEBUG_ANY,
"bdb_db_recover: Database cannot be recovered. "\
"Restore from backup!\n", 0, 0, 0);

2
servers/slapd/back-ldbm/close.c
View file

@ -26,8 +26,6 @@
int
ldbm_back_db_close( Backend *be )
{
struct ldbminfo *li = (struct ldbminfo *) be->be_private;
Debug( LDAP_DEBUG_TRACE, "ldbm backend syncing\n", 0, 0, 0 );
ldbm_cache_flush_all( be );

6
servers/slapd/back-meta/candidates.c
View file

@ -50,10 +50,6 @@
* A possible extension will include the handling of multiple suffixes
*/
static int
meta_back_is_candidate_unique(
metainfo_t *mi,
struct berval *ndn );
/*
* returns 1 if suffix is candidate for dn, otherwise 0
@ -80,6 +76,7 @@ meta_back_is_candidate(
return META_NOT_CANDIDATE;
}
#if 0
/*
* meta_back_is_candidate_unique
*
@ -99,6 +96,7 @@ meta_back_is_candidate_unique(
return 1;
}
#endif /* 0 */
/*
* meta_back_select_unique_candidate

1
servers/slapd/back-meta/compare.c
View file

@ -71,7 +71,6 @@ meta_back_compare( Operation *op, SlapReply *rs )
dc.ctx = "compareDN";
for ( i = 0; i < mi->mi_ntargets; i++ ) {
metasingleconn_t *msc = &mc->mc_conns[ i ];
struct berval mdn = BER_BVNULL;
struct berval mapped_attr = op->orc_ava->aa_desc->ad_cname;
struct berval mapped_value = op->orc_ava->aa_value;

1
servers/slapd/back-meta/conn.c
View file

@ -570,7 +570,6 @@ meta_back_candidates_get( Operation *op )
{
metainfo_t *mi = ( metainfo_t * )op->o_bd->be_private;
metacandidates_t *mc;
SlapReply *rs;
if ( op->o_threadctx ) {
void *data = NULL;

1
servers/slapd/backover.c
View file

@ -74,7 +74,6 @@ over_db_config(
BackendInfo *bi_orig = be->bd_info;
struct ConfigOCs *be_cf_ocs = be->be_cf_ocs;
ConfigArgs ca = {0};
ConfigTable *ct;
int rc = 0;
if ( oi->oi_orig->bi_db_config ) {

14
servers/slapd/component.c
View file

@ -99,7 +99,7 @@ componentFilterMatch (
{
ComponentSyntaxInfo *csi_attr = (ComponentSyntaxInfo*)value;
MatchingRuleAssertion * ma = (MatchingRuleAssertion*)assertedValue;
int num_attr, rc, i;
int rc;
if ( !mr || !ma->ma_cf ) return LDAP_INAPPROPRIATE_MATCHING;
@ -154,8 +154,6 @@ allComponentsMatch(
static int
slapd_ber2cav( struct berval* bv, ComponentAssertionValue* cav )
{
int len;
cav->cav_ptr = cav->cav_buf = bv->bv_val;
cav->cav_end = bv->bv_val + bv->bv_len;
@ -165,11 +163,9 @@ slapd_ber2cav( struct berval* bv, ComponentAssertionValue* cav )
ComponentReference*
dup_comp_ref ( Operation* op, ComponentReference* cr )
{
int rc, count = 0;
ComponentReference* dup_cr;
ComponentId* ci_curr;
ComponentId** ci_temp;
ber_int_t type;
dup_cr = op->o_tmpalloc( sizeof( ComponentReference ), op->o_tmpmemctx );
@ -234,7 +230,6 @@ dup_comp_filter_item (
ComponentAssertion* in_ca,
ComponentAssertion** out_ca )
{
ComponentAssertion* ca;
int len;
if ( !in_ca->ca_comp_ref ) return SLAPD_DISCONNECT;
@ -301,9 +296,7 @@ dup_comp_filter (
int
get_aliased_filter_aa ( Operation* op, AttributeAssertion* a_assert, AttributeAliasing* aa, const char** text )
{
int rc;
struct berval assert_bv;
ComponentAssertion* ca;
Debug( LDAP_DEBUG_FILTER, "get_aliased_filter\n", 0, 0, 0 );
@ -324,9 +317,7 @@ get_aliased_filter( Operation* op,
MatchingRuleAssertion* ma, AttributeAliasing* aa,
const char** text )
{
int rc;
struct berval assert_bv;
ComponentAssertion* ca;
Debug( LDAP_DEBUG_FILTER, "get_aliased_filter\n", 0, 0, 0 );
@ -956,7 +947,6 @@ get_item( Operation *op, ComponentAssertionValue* cav, ComponentAssertion** ca,
{
int rc;
ComponentAssertion* _ca;
struct berval t_bv;
struct berval value;
MatchingRule* mr;
@ -1268,7 +1258,7 @@ test_comp_filter_item(
ComponentSyntaxInfo *csi_attr,
ComponentAssertion *ca )
{
int rc, len;
int rc;
void *attr_nm, *assert_nm;
if ( strcmp(ca->ca_ma_rule->smr_mrule.mr_oid,

5
servers/slapd/controls.c
View file

@ -32,7 +32,9 @@ static SLAP_CTRL_PARSE_FN parseProxyAuthz;
static SLAP_CTRL_PARSE_FN parseManageDIT;
#endif
static SLAP_CTRL_PARSE_FN parseManageDSAit;
#ifdef LDAP_CONTROL_MODIFY_INCREMENT
static SLAP_CTRL_PARSE_FN parseModifyIncrement;
#endif
static SLAP_CTRL_PARSE_FN parseNoOp;
static SLAP_CTRL_PARSE_FN parsePagedResults;
#ifdef LDAP_DEVEL
@ -672,7 +674,6 @@ int get_ctrls(
rs->sr_text = "critical extension is not recognized";
goto return_results;
}
next_ctrl:;
}
return_results:
@ -693,6 +694,7 @@ return_results:
return rs->sr_err;
}
#ifdef LDAP_CONTROL_MODIFY_INCREMENT
static int parseModifyIncrement (
Operation *op,
SlapReply *rs,
@ -718,6 +720,7 @@ static int parseModifyIncrement (
return LDAP_SUCCESS;
}
#endif
#ifdef LDAP_DEVEL
static int parseManageDIT (

2
servers/slapd/ldapsync.c
View file

@ -176,9 +176,7 @@ slap_dup_sync_cookie(
struct sync_cookie *src
)
{
int i;
struct sync_cookie *new;
struct berval tmp_bv;
if ( src == NULL )
return NULL;

2
servers/slapd/oc.c
View file

@ -604,7 +604,7 @@ oc_unparse( BerVarray *res, ObjectClass *start, ObjectClass *end, int sys )
ObjectClass *oc;
int i, num;
struct berval bv, *bva = NULL, idx;
char ibuf[32], *ptr;
char ibuf[32];
if ( !start )
start = LDAP_STAILQ_FIRST( &oc_list );

2
servers/slapd/oidm.c
View file

@ -156,7 +156,7 @@ void oidm_unparse( BerVarray *res, OidMacro *start, OidMacro *end, int sys )
{
OidMacro *om;
int i, j, num;
struct berval bv, *bva = NULL, idx;
struct berval *bva = NULL, idx;
char ibuf[32], *ptr;
if ( !start )

2
servers/slapd/phonetic.c
View file

@ -43,6 +43,7 @@
ispunct((unsigned char) (x)) || \
isdigit((unsigned char) (x)) || (x) == '\0')
#if 0
static char *
first_word( char *s )
{
@ -98,6 +99,7 @@ word_dup( char *w )
return( ret );
}
#endif /* 0 */
#ifndef MAXPHONEMELEN
#define MAXPHONEMELEN 4

1
servers/slapd/root_dse.c
View file

@ -53,7 +53,6 @@ root_dse_info(
{
Entry *e;
struct berval val, *bv;
struct berval nval;
int i, j;
char ** supportedSASLMechanisms;
BackendDB *be;

7
servers/slapd/saslauthz.c
View file

@ -494,6 +494,7 @@ done:
return( rc );
}
#ifndef SLAP_AUTH_REWRITE
static int slap_sasl_rx_off(char *rep, int *off)
{
const char *c;
@ -527,6 +528,7 @@ static int slap_sasl_rx_off(char *rep, int *off)
off[n] = -1;
return( LDAP_SUCCESS );
}
#endif /* ! SLAP_AUTH_REWRITE */
#ifdef SLAP_AUTH_REWRITE
int slap_sasl_rewrite_config(
@ -644,7 +646,6 @@ int slap_sasl_regexp_config( const char *match, const char *replace )
void slap_sasl_regexp_unparse( BerVarray *out )
{
int i;
struct berval bv;
BerVarray bva = NULL;
char ibuf[32], *ptr;
struct berval idx;
@ -670,6 +671,7 @@ void slap_sasl_regexp_unparse( BerVarray *out )
*out = bva;
}
#ifndef SLAP_AUTH_REWRITE
/* Perform replacement on regexp matches */
static void slap_sasl_rx_exp(
const char *rep,
@ -721,6 +723,7 @@ static void slap_sasl_rx_exp(
out->bv_val[insert] = '\0';
}
#endif /* ! SLAP_AUTH_REWRITE */
/* Take the passed in SASL name and attempt to convert it into an
LDAP URI to find the matching LDAP entry, using the pattern matching
@ -1102,7 +1105,7 @@ slap_sasl_check_authz( Operation *op,
AttributeDescription *ad,
struct berval *authc )
{
int i, rc;
int rc;
BerVarray vals = NULL;
Debug( LDAP_DEBUG_TRACE,

4
servers/slapd/slapadd.c
View file

@ -63,8 +63,7 @@ slapadd( int argc, char **argv )
ID ctxcsn_id, id;
int ret;
struct berval bvtext;
int i, checkvals;
struct berval mc;
int checkvals;
slap_tool_init( progname, SLAPADD, argc, argv );
if( !be->be_entry_open ||
@ -314,7 +313,6 @@ slapadd( int argc, char **argv )
}
}
done:;
entry_free( e );
}

6
servers/slapd/str2filter.c
View file

@ -34,12 +34,6 @@
#include "slap.h"
#if 0 /* unused */
static char *find_matching_paren( const char *s );
#endif /* unused */
static Filter *str2list( const char *str, long unsigned int ftype);
static Filter *str2simple( const char *str);
static int str2subvals( const char *val, Filter *f);
Filter *
str2filter_x( Operation *op, const char *str )

2
servers/slapd/syncrepl.c
View file

@ -2659,7 +2659,7 @@ syncrepl_unparse( syncinfo_t *si, struct berval *bv )
{
struct berval bc;
char buf[BUFSIZ*2], *ptr;
int i, len;
int i;
bindconf_unparse( &si->si_bindconf, &bc );
ptr = buf;

1
servers/slapd/value.c
View file

@ -312,7 +312,6 @@ ordered_value_sort( Attribute *a, int do_renumber )
int i, vals;
int index = 0, noindex = 0, renumber = 0, gotnvals = 0;
struct berval tmp;
char *ptr;
if ( a->a_nvals && a->a_nvals != a->a_vals )
gotnvals = 1;