libraries/liblber/decode.c - diff

Return to decode.c CVS log

Up to [OpenLDAP] / libraries / liblber

Diff for /libraries/liblber/decode.c between versions 1.26 and 1.27

version 1.26, 1999/05/20 19:53:56	version 1.27, 1999/05/28 01:24:41
Line 409 ber_first_element( BerElement *ber, unsi	Line 409 ber_first_element( BerElement *ber, unsi
last = ber->ber_ptr + len;	last = ber->ber_ptr + len;

if ( *last == ber->ber_ptr ) {	if ( *last == ber->ber_ptr ) {
#ifdef LBER_END_SEQORSET
return( LBER_END_SEQORSET );
#else
return( LBER_DEFAULT );	return( LBER_DEFAULT );
#endif
}	}

return( ber_peek_tag( ber, len ) );	return( ber_peek_tag( ber, len ) );
Line 427 ber_next_element( BerElement *ber, unsig	Line 423 ber_next_element( BerElement *ber, unsig
assert( last != NULL );	assert( last != NULL );

if ( ber->ber_ptr == last ) {	if ( ber->ber_ptr == last ) {
#ifdef LBER_END_SEQORSET
return( LBER_END_SEQORSET );
#else
return( LBER_DEFAULT );	return( LBER_DEFAULT );
#endif
}	}

return( ber_peek_tag( ber, len ) );	return( ber_peek_tag( ber, len ) );
Line 556 va_dcl	Line 548 va_dcl
*sss = NULL;	*sss = NULL;
j = 0;	j = 0;
for ( tag = ber_first_element( ber, &len, &last );	for ( tag = ber_first_element( ber, &len, &last );
tag != LBER_DEFAULT &&	tag != LBER_DEFAULT && rc != LBER_DEFAULT;
#ifdef LBER_END_SEQORSET
tag != LBER_END_SEQORSET &&
#endif
rc != LBER_DEFAULT;
tag = ber_next_element( ber, &len, last ) )	tag = ber_next_element( ber, &len, last ) )
{	{
if ( *sss == NULL ) {	if ( *sss == NULL ) {
Line 573 va_dcl	Line 561 va_dcl
rc = ber_get_stringa( ber, &((*sss)[j]) );	rc = ber_get_stringa( ber, &((*sss)[j]) );
j++;	j++;
}	}
#ifdef LBER_END_SEQORSET
if (rc != LBER_DEFAULT &&
tag != LBER_END_SEQORSET )
{
rc = LBER_DEFAULT;
}
#endif
if ( j > 0 )	if ( j > 0 )
(*sss)[j] = NULL;	(*sss)[j] = NULL;
break;	break;
Line 589 va_dcl	Line 570 va_dcl
*bv = NULL;	*bv = NULL;
j = 0;	j = 0;
for ( tag = ber_first_element( ber, &len, &last );	for ( tag = ber_first_element( ber, &len, &last );
tag != LBER_DEFAULT &&	tag != LBER_DEFAULT && rc != LBER_DEFAULT;
#ifdef LBER_END_SEQORSET
tag != LBER_END_SEQORSET &&
#endif
rc != LBER_DEFAULT;
tag = ber_next_element( ber, &len, last ) )	tag = ber_next_element( ber, &len, last ) )
{	{
if ( *bv == NULL ) {	if ( *bv == NULL ) {
Line 606 va_dcl	Line 583 va_dcl
rc = ber_get_stringal( ber, &((*bv)[j]) );	rc = ber_get_stringal( ber, &((*bv)[j]) );
j++;	j++;
}	}
#ifdef LBER_END_SEQORSET
if (rc != LBER_DEFAULT &&
tag != LBER_END_SEQORSET )
{
rc = LBER_DEFAULT;
}
#endif
if ( j > 0 )	if ( j > 0 )
(*bv)[j] = NULL;	(*bv)[j] = NULL;
break;	break;

Removed from v.1.26
changed lines
	Added in v.1.27