From 5930d0e64cc9ee8233cdf34861c1df7a91b592e3 Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Fri, 15 Sep 2000 18:13:51 +0000 Subject: [PATCH] Remove lint and sync with devel, no functional changes --- libraries/liblber/lber-int.h | 3 ++- libraries/liblber/options.c | 6 +++--- libraries/libldap/controls.c | 3 +-- libraries/liblutil/signal.c | 1 - servers/slapd/schema_init.c | 41 ++++++++++++++++++++++++------------ 5 files changed, 33 insertions(+), 21 deletions(-) diff --git a/libraries/liblber/lber-int.h b/libraries/liblber/lber-int.h index 7234e33db2..00a8f06a6c 100644 --- a/libraries/liblber/lber-int.h +++ b/libraries/liblber/lber-int.h @@ -61,8 +61,9 @@ struct berelement { }; #define BER_VALID(ber) ((ber)->ber_valid==LBER_VALID_BERELEMENT) -#define ber_pvt_ber_bytes(ber) ((ber)->ber_ptr - (ber)->ber_buf) #define ber_pvt_ber_remaining(ber) ((ber)->ber_end - (ber)->ber_ptr) +#define ber_pvt_ber_total(ber) ((ber)->ber_end - (ber)->ber_buf) +#define ber_pvt_ber_write(ber) ((ber)->ber_ptr - (ber)->ber_buf) struct sockbuf { struct lber_options sb_opts; diff --git a/libraries/liblber/options.c b/libraries/liblber/options.c index 3689f0df58..13a484335e 100644 --- a/libraries/liblber/options.c +++ b/libraries/liblber/options.c @@ -71,15 +71,15 @@ ber_get_option( return LBER_OPT_SUCCESS; case LBER_OPT_BER_REMAINING_BYTES: - *((ber_len_t *) outvalue) = ber->ber_end - ber->ber_ptr; + *((ber_len_t *) outvalue) = ber_pvt_ber_remaining(ber); return LBER_OPT_SUCCESS; case LBER_OPT_BER_TOTAL_BYTES: - *((ber_len_t *) outvalue) = ber->ber_end - ber->ber_buf; + *((ber_len_t *) outvalue) = ber_pvt_ber_total(ber); return LBER_OPT_SUCCESS; case LBER_OPT_BER_BYTES_TO_WRITE: - *((ber_len_t *) outvalue) = ber->ber_ptr - ber->ber_buf; + *((ber_len_t *) outvalue) = ber_pvt_ber_write(ber); return LBER_OPT_SUCCESS; default: diff --git a/libraries/libldap/controls.c b/libraries/libldap/controls.c index 6a814b80fe..c48e83cb89 100644 --- a/libraries/libldap/controls.c +++ b/libraries/libldap/controls.c @@ -125,14 +125,13 @@ int ldap_int_get_controls( } *ctrls = NULL; - len = ber_pvt_ber_remaining(ber); + len = ber_pvt_ber_remaining( ber ); if( len == 0) { /* no controls */ return LDAP_SUCCESS; } - if(( tag = ber_peek_tag( ber, &len )) != LDAP_TAG_CONTROLS ) { if( tag == LBER_ERROR ) { /* decoding error */ diff --git a/libraries/liblutil/signal.c b/libraries/liblutil/signal.c index 4c2b513fd1..39a7da3230 100644 --- a/libraries/liblutil/signal.c +++ b/libraries/liblutil/signal.c @@ -14,7 +14,6 @@ lutil_sig_t lutil_sigaction(int sig, lutil_sig_t func) { - int rc; struct sigaction action, oaction; memset( &action, '\0', sizeof(action) ); diff --git a/servers/slapd/schema_init.c b/servers/slapd/schema_init.c index 76ccab5c91..5fda4b0992 100644 --- a/servers/slapd/schema_init.c +++ b/servers/slapd/schema_init.c @@ -120,12 +120,13 @@ int octetStringIndexer( digest.bv_val = MD5digest; digest.bv_len = sizeof(MD5digest); + /* we should have at least one value at this point */ + assert( values != NULL && values[0] != NULL ); + for( i=0; values[i] != NULL; i++ ) { /* just count them */ } - assert( i > 0 ); - keys = ch_malloc( sizeof( struct berval * ) * (i+1) ); slen = strlen( syntax->ssyn_oid ); @@ -791,12 +792,13 @@ int caseExactIndexer( digest.bv_val = MD5digest; digest.bv_len = sizeof(MD5digest); + /* we should have at least one value at this point */ + assert( values != NULL && values[0] != NULL ); + for( i=0; values[i] != NULL; i++ ) { /* just count them */ } - assert( i > 0 ); - keys = ch_malloc( sizeof( struct berval * ) * (i+1) ); slen = strlen( syntax->ssyn_oid ); @@ -891,6 +893,9 @@ int caseExactSubstringsIndexer( digest.bv_val = MD5digest; digest.bv_len = sizeof(MD5digest); + /* we should have at least one value at this point */ + assert( values != NULL && values[0] != NULL ); + nkeys=0; for( i=0; values[i] != NULL; i++ ) { /* count number of indices to generate */ @@ -922,7 +927,6 @@ int caseExactSubstringsIndexer( } } } - assert( i > 0 ); if( nkeys == 0 ) { /* no keys to generate */ @@ -1358,12 +1362,13 @@ int caseIgnoreIndexer( digest.bv_val = MD5digest; digest.bv_len = sizeof(MD5digest); + /* we should have at least one value at this point */ + assert( values != NULL && values[0] != NULL ); + for( i=0; values[i] != NULL; i++ ) { /* just count them */ } - assert( i > 0 ); - keys = ch_malloc( sizeof( struct berval * ) * (i+1) ); slen = strlen( syntax->ssyn_oid ); @@ -1465,6 +1470,9 @@ int caseIgnoreSubstringsIndexer( digest.bv_val = MD5digest; digest.bv_len = sizeof(MD5digest); + /* we should have at least one value at this point */ + assert( values != NULL && values[0] != NULL ); + nkeys=0; for( i=0; values[i] != NULL; i++ ) { /* count number of indices to generate */ @@ -1496,7 +1504,6 @@ int caseIgnoreSubstringsIndexer( } } } - assert( i > 0 ); if( nkeys == 0 ) { /* no keys to generate */ @@ -2139,12 +2146,13 @@ int caseExactIA5Indexer( digest.bv_val = MD5digest; digest.bv_len = sizeof(MD5digest); + /* we should have at least one value at this point */ + assert( values != NULL && values[0] != NULL ); + for( i=0; values[i] != NULL; i++ ) { /* just count them */ } - assert( i > 0 ); - keys = ch_malloc( sizeof( struct berval * ) * (i+1) ); slen = strlen( syntax->ssyn_oid ); @@ -2239,6 +2247,9 @@ int caseExactIA5SubstringsIndexer( digest.bv_val = MD5digest; digest.bv_len = sizeof(MD5digest); + /* we should have at least one value at this point */ + assert( values != NULL && values[0] != NULL ); + nkeys=0; for( i=0; values[i] != NULL; i++ ) { /* count number of indices to generate */ @@ -2270,7 +2281,6 @@ int caseExactIA5SubstringsIndexer( } } } - assert( i > 0 ); if( nkeys == 0 ) { /* no keys to generate */ @@ -2702,12 +2712,13 @@ int caseIgnoreIA5Indexer( digest.bv_val = MD5digest; digest.bv_len = sizeof(MD5digest); + /* we should have at least one value at this point */ + assert( values != NULL && values[0] != NULL ); + for( i=0; values[i] != NULL; i++ ) { /* just count them */ } - assert( i > 0 ); - keys = ch_malloc( sizeof( struct berval * ) * (i+1) ); slen = strlen( syntax->ssyn_oid ); @@ -2809,6 +2820,9 @@ int caseIgnoreIA5SubstringsIndexer( digest.bv_val = MD5digest; digest.bv_len = sizeof(MD5digest); + /* we should have at least one value at this point */ + assert( values != NULL && values[0] != NULL ); + nkeys=0; for( i=0; values[i] != NULL; i++ ) { /* count number of indices to generate */ @@ -2840,7 +2854,6 @@ int caseIgnoreIA5SubstringsIndexer( } } } - assert( i > 0 ); if( nkeys == 0 ) { /* no keys to generate */ -- 2.39.5