upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2026-01-24 15:52:54 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add LDAP_VALID and other asserts.

Browse source
This commit is contained in:
Kurt Zeilenga 1999-06-21 22:38:00 +00:00
parent 2fda53f375
commit 24c39b31b6
5 changed files with 24 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libraries/libldap/addentry.c
View file

@ -27,6 +27,9 @@ ldap_delete_result_entry( LDAPMessage **list, LDAPMessage *e )
{
LDAPMessage *tmp, *prev = NULL;
assert( list != NULL );
assert( e != NULL );
for ( tmp = *list; tmp != NULL && tmp != e; tmp = tmp->lm_chain )
prev = tmp;
@ -45,6 +48,9 @@ ldap_delete_result_entry( LDAPMessage **list, LDAPMessage *e )
void
ldap_add_result_entry( LDAPMessage **list, LDAPMessage *e )
{
assert( list != NULL );
assert( e != NULL );
e->lm_chain = *list;
*list = e;
}

2
libraries/libldap/getattr.c
View file

@ -46,7 +46,7 @@ ldap_first_attribute( LDAP *ld, LDAPMessage *entry, BerElement **ber )
* positioned right before the next attribute type/value sequence.
*/
if ( ber_scanf( *ber, "{x{{ax}", &attr )
if ( ber_scanf( *ber, "{x{{ax}" /*}}*/, &attr )
== LBER_ERROR ) {
ld->ld_errno = LDAP_DECODING_ERROR;
ber_free( *ber, 0 );

2
libraries/libldap/getentry.c
View file

@ -27,6 +27,7 @@ ldap_first_entry( LDAP *ld, LDAPMessage *chain )
{
assert( ld != NULL );
assert( LDAP_VALID( ld ) );
assert( chain != NULL );
if( ld == NULL || chain == NULL ) {
return NULL;
@ -42,6 +43,7 @@ ldap_next_entry( LDAP *ld, LDAPMessage *entry )
{
assert( ld != NULL );
assert( LDAP_VALID( ld ) );
assert( entry != NULL );
if ( ld == NULL || entry == NULL ) {
return NULL;

10
libraries/libldap/getvalues.c
View file

@ -30,6 +30,11 @@ ldap_get_values( LDAP *ld, LDAPMessage *entry, LDAP_CONST char *target )
int found = 0;
char **vals;
assert( ld != NULL );
assert( LDAP_VALID( ld ) );
assert( entry != NULL );
assert( target != NULL );
Debug( LDAP_DEBUG_TRACE, "ldap_get_values\n", 0, 0, 0 );
ber = *entry->lm_ber;
@ -82,6 +87,11 @@ ldap_get_values_len( LDAP *ld, LDAPMessage *entry, LDAP_CONST char *target )
int found = 0;
struct berval **vals;
assert( ld != NULL );
assert( LDAP_VALID( ld ) );
assert( entry != NULL );
assert( target != NULL );
Debug( LDAP_DEBUG_TRACE, "ldap_get_values_len\n", 0, 0, 0 );
ber = *entry->lm_ber;

6
libraries/libldap/references.c
View file

@ -19,11 +19,11 @@
#include "ldap-int.h"
/* ARGSUSED */
LDAPMessage *
ldap_first_reference( LDAP *ld, LDAPMessage *chain )
{
assert( ld != NULL );
assert( LDAP_VALID( ld ) );
assert( chain != NULL );
if ( ld == NULL || chain == NULL ) {
@ -39,6 +39,7 @@ LDAPMessage *
ldap_next_reference( LDAP *ld, LDAPMessage *ref )
{
assert( ld != NULL );
assert( LDAP_VALID( ld ) );
assert( ref != NULL );
if ( ld == NULL || ref == NULL ) {
@ -64,12 +65,14 @@ ldap_count_references( LDAP *ld, LDAPMessage *chain )
int i;
assert( ld != NULL );
assert( LDAP_VALID( ld ) );
assert( chain != NULL );
if ( ld == NULL ) {
return -1;
}
for ( i = 0; chain != NULL; chain = chain->lm_chain ) {
if( chain->lm_msgtype == LDAP_RES_SEARCH_REFERENCE ) {
i++;
@ -92,6 +95,7 @@ ldap_parse_reference(
int rc;
assert( ld != NULL );
assert( LDAP_VALID( ld ) );
assert( ref != NULL );
if( ld == NULL || ref == NULL ||