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.24 and 1.25

version 1.24, 1999/05/20 17:38:03	version 1.25, 1999/05/20 19:21:57
Line 127 ber_peek_tag(	Line 127 ber_peek_tag(
unsigned long *len )	unsigned long *len )
{	{
unsigned long tag;	unsigned long tag;
BerElement *ber = ber_dup( ber_in );	BerElement *ber;

	assert( ber_in != NULL );

	ber = ber_dup( ber_in );

if( ber == NULL ) {	if( ber == NULL ) {
return LBER_ERROR;	return LBER_ERROR;
Line 183 ber_get_int( BerElement ber, long num	Line 187 ber_get_int( BerElement ber, long num
{	{
unsigned long tag, len;	unsigned long tag, len;

	assert( ber != NULL );

if ( (tag = ber_skip_tag( ber, &len )) == LBER_DEFAULT )	if ( (tag = ber_skip_tag( ber, &len )) == LBER_DEFAULT )
return( LBER_DEFAULT );	return( LBER_DEFAULT );

Line 200 ber_get_stringb( BerElement ber, char	Line 206 ber_get_stringb( BerElement ber, char
char *transbuf;	char *transbuf;
#endif /* STR_TRANSLATION */	#endif /* STR_TRANSLATION */

	assert( ber != NULL );

if ( (tag = ber_skip_tag( ber, &datalen )) == LBER_DEFAULT )	if ( (tag = ber_skip_tag( ber, &datalen )) == LBER_DEFAULT )
return( LBER_DEFAULT );	return( LBER_DEFAULT );
if ( datalen > (*len - 1) )	if ( datalen > (*len - 1) )
Line 238 ber_get_stringa( BerElement ber, char	Line 246 ber_get_stringa( BerElement ber, char
{	{
unsigned long datalen, tag;	unsigned long datalen, tag;

	assert( ber != NULL );
	assert( buf != NULL );

if ( (tag = ber_skip_tag( ber, &datalen )) == LBER_DEFAULT ) {	if ( (tag = ber_skip_tag( ber, &datalen )) == LBER_DEFAULT ) {
*buf = NULL;	*buf = NULL;
return( LBER_DEFAULT );	return( LBER_DEFAULT );
Line 274 ber_get_stringal( BerElement *ber, struc	Line 285 ber_get_stringal( BerElement *ber, struc
{	{
unsigned long len, tag;	unsigned long len, tag;

	assert( ber != NULL );
	assert( bv != NULL );

if ( (tag = ber_skip_tag( ber, &len )) == LBER_DEFAULT ) {	if ( (tag = ber_skip_tag( ber, &len )) == LBER_DEFAULT ) {
*bv = NULL;	*bv = NULL;
return( LBER_DEFAULT );	return( LBER_DEFAULT );
Line 319 ber_get_bitstringa( BerElement *ber, cha	Line 333 ber_get_bitstringa( BerElement *ber, cha
unsigned long datalen, tag;	unsigned long datalen, tag;
unsigned char unusedbits;	unsigned char unusedbits;

	assert( ber != NULL );
	assert( buf != NULL );
	assert( blen != NULL );

if ( (tag = ber_skip_tag( ber, &datalen )) == LBER_DEFAULT ) {	if ( (tag = ber_skip_tag( ber, &datalen )) == LBER_DEFAULT ) {
*buf = NULL;	*buf = NULL;
return( LBER_DEFAULT );	return( LBER_DEFAULT );
Line 349 ber_get_null( BerElement *ber )	Line 367 ber_get_null( BerElement *ber )
{	{
unsigned long len, tag;	unsigned long len, tag;

	assert( ber != NULL );

if ( (tag = ber_skip_tag( ber, &len )) == LBER_DEFAULT )	if ( (tag = ber_skip_tag( ber, &len )) == LBER_DEFAULT )
return( LBER_DEFAULT );	return( LBER_DEFAULT );

Line 364 ber_get_boolean( BerElement ber, int b	Line 384 ber_get_boolean( BerElement ber, int b
long longbool;	long longbool;
int rc;	int rc;

	assert( ber != NULL );
	assert( boolval != NULL );

rc = ber_get_int( ber, &longbool );	rc = ber_get_int( ber, &longbool );
*boolval = longbool;	*boolval = longbool;

Line 373 ber_get_boolean( BerElement ber, int b	Line 396 ber_get_boolean( BerElement ber, int b
unsigned long	unsigned long
ber_first_element( BerElement ber, unsigned long len, char **last )	ber_first_element( BerElement ber, unsigned long len, char **last )
{	{
	assert( ber != NULL );
	assert( len != NULL );
	assert( last != NULL );

/* skip the sequence header, use the len to mark where to stop */	/* skip the sequence header, use the len to mark where to stop */
if ( ber_skip_tag( ber, len ) == LBER_DEFAULT ) {	if ( ber_skip_tag( ber, len ) == LBER_DEFAULT ) {
*last = NULL;	*last = NULL;
Line 395 ber_first_element( BerElement *ber, unsi	Line 422 ber_first_element( BerElement *ber, unsi
unsigned long	unsigned long
ber_next_element( BerElement ber, unsigned long len, char *last )	ber_next_element( BerElement ber, unsigned long len, char *last )
{	{
	assert( ber != NULL );
	assert( len != NULL );
	assert( last != NULL );

if ( ber->ber_ptr == last ) {	if ( ber->ber_ptr == last ) {
#ifdef LBER_END_SEQORSET	#ifdef LBER_END_SEQORSET
return( LBER_END_SEQORSET );	return( LBER_END_SEQORSET );
Line 431 va_dcl	Line 462 va_dcl
long *l;	long *l;
unsigned long rc, tag, len;	unsigned long rc, tag, len;

assert( ber != NULL );

#ifdef HAVE_STDARG	#ifdef HAVE_STDARG
va_start( ap, fmt );	va_start( ap, fmt );
#else	#else

Removed from v.1.24
changed lines
	Added in v.1.25