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.19 and 1.20

version 1.19, 1999/04/30 06:23:32	version 1.20, 1999/05/18 23:12:36
Line 38 ber_get_tag( BerElement *ber )	Line 38 ber_get_tag( BerElement *ber )
char *tagp;	char *tagp;
unsigned int i;	unsigned int i;

	assert( ber != NULL );

if ( ber_read( ber, (char *) &xbyte, 1 ) != 1 )	if ( ber_read( ber, (char *) &xbyte, 1 ) != 1 )
return( LBER_DEFAULT );	return( LBER_DEFAULT );

Line 72 ber_skip_tag( BerElement *ber, unsigned	Line 74 ber_skip_tag( BerElement *ber, unsigned
int noctets, diff;	int noctets, diff;
unsigned long netlen;	unsigned long netlen;

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

/*	/*
* Any ber element looks like this: tag length contents.	* Any ber element looks like this: tag length contents.
* Assuming everything's ok, we return the tag byte (we	* Assuming everything's ok, we return the tag byte (we
Line 116 ber_skip_tag( BerElement *ber, unsigned	Line 121 ber_skip_tag( BerElement *ber, unsigned
}	}

unsigned long	unsigned long
ber_peek_tag( BerElement ber, unsigned long len )	ber_peek_tag(
	LDAP_CONST BerElement ber_in, / not const per c-api-02 */
	unsigned long *len )
{	{
char *save;
unsigned long tag;	unsigned long tag;
	BerElement *ber = ber_dup( ber_in );

	if( ber == NULL ) {
	return LBER_ERROR;
	}

save = ber->ber_ptr;
tag = ber_skip_tag( ber, len );	tag = ber_skip_tag( ber, len );
ber->ber_ptr = save;

	ber_free( ber, 1 );
return( tag );	return( tag );
}	}

Line 135 ber_getnint( BerElement ber, long num,	Line 145 ber_getnint( BerElement ber, long num,
long netnum;	long netnum;
char *p;	char *p;

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

/*	/*
* The tag and length have already been stripped off. We should	* The tag and length have already been stripped off. We should
* be sitting right before len bytes of 2's complement integer,	* be sitting right before len bytes of 2's complement integer,
Line 396 ber_next_element( BerElement *ber, unsig	Line 409 ber_next_element( BerElement *ber, unsig
unsigned long	unsigned long
ber_scanf	ber_scanf
#if HAVE_STDARG	#if HAVE_STDARG
( BerElement ber, char fmt, ... )	( BerElement *ber,
	LDAP_CONST char *fmt,
	... )
#else	#else
( va_alist )	( va_alist )
va_dcl	va_dcl
Line 407 va_dcl	Line 422 va_dcl
BerElement *ber;	BerElement *ber;
char *fmt;	char *fmt;
#endif	#endif
char *fmt_reset;	LDAP_CONST char *fmt_reset;
char *last;	char *last;
char s, ss, **sss;	char s, ss, **sss;
struct berval *bv, bvp, *bval;	struct berval *bv, bvp, *bval;
Line 415 va_dcl	Line 430 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
Line 422 va_dcl	Line 439 va_dcl
ber = va_arg( ap, BerElement * );	ber = va_arg( ap, BerElement * );
fmt = va_arg( ap, char * );	fmt = va_arg( ap, char * );
#endif	#endif

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

fmt_reset = fmt;	fmt_reset = fmt;

if ( ber->ber_debug ) {	if ( ber->ber_debug ) {
lber_log_printf( LDAP_DEBUG_TRACE, ber->ber_debug,	ber_log_printf( LDAP_DEBUG_TRACE, ber->ber_debug,
"ber_scanf fmt (%s) ber:\n", fmt );	"ber_scanf fmt (%s) ber:\n", fmt );
lber_log_dump( LDAP_DEBUG_BER, ber->ber_debug, ber, 1 );	ber_log_dump( LDAP_DEBUG_BER, ber->ber_debug, ber, 1 );
}	}

for ( rc = 0; *fmt && rc != LBER_DEFAULT; fmt++ ) {	for ( rc = 0; *fmt && rc != LBER_DEFAULT; fmt++ ) {
/* When this is modified, remember to update	/* When this is modified, remember to update
* the error-cleanup code below accordingly. */	* the error-cleanup code below accordingly. */
switch ( *fmt ) {	switch ( *fmt ) {
	case '!': { /* Hook */
	BERDecodeCallback *f;
	void *p;

	f = va_arg( ap, BERDecodeCallback * );
	p = va_arg( ap, void * );

	rc = (*f)( ber, p, 0 );
	} break;

case 'a': /* octet string - allocate storage as needed */	case 'a': /* octet string - allocate storage as needed */
ss = va_arg( ap, char ** );	ss = va_arg( ap, char ** );
rc = ber_get_stringa( ber, ss );	rc = ber_get_stringa( ber, ss );
Line 576 va_dcl	Line 607 va_dcl

default:	default:
if( ber->ber_debug ) {	if( ber->ber_debug ) {
lber_log_printf( LDAP_DEBUG_ANY, ber->ber_debug,	ber_log_printf( LDAP_DEBUG_ANY, ber->ber_debug,
"ber_scanf: unknown fmt %c\n", *fmt );	"ber_scanf: unknown fmt %c\n", *fmt );
}	}
rc = LBER_DEFAULT;	rc = LBER_DEFAULT;
Line 601 va_dcl	Line 632 va_dcl

for ( ; fmt_reset < fmt; fmt_reset++ ) {	for ( ; fmt_reset < fmt; fmt_reset++ ) {
switch ( *fmt_reset ) {	switch ( *fmt_reset ) {
	case '!': { /* Hook */
	BERDecodeCallback *f;
	void *p;

	f = va_arg( ap, BERDecodeCallback * );
	p = va_arg( ap, void * );

	(void) (*f)( ber, p, 1 );
	} break;

case 'a': /* octet string - allocate storage as needed */	case 'a': /* octet string - allocate storage as needed */
ss = va_arg( ap, char ** );	ss = va_arg( ap, char ** );
if ( *ss ) {	if ( *ss ) {
Line 689 va_dcl	Line 730 va_dcl
void	void
ber_bvfree( struct berval *bv )	ber_bvfree( struct berval *bv )
{	{
#ifdef LBER_ASSERT
assert(bv != NULL); /* bv damn better point to something */	assert(bv != NULL); /* bv damn better point to something */
#endif
if ( bv->bv_val != NULL )	if ( bv->bv_val != NULL )
free( bv->bv_val );	free( bv->bv_val );
free( (char *) bv );	free( (char *) bv );
Line 702 ber_bvecfree( struct berval **bv )	Line 742 ber_bvecfree( struct berval **bv )
{	{
int i;	int i;

#ifdef LBER_ASSERT
assert(bv != NULL); /* bv damn better point to something */	assert(bv != NULL); /* bv damn better point to something */
#endif
for ( i = 0; bv[i] != NULL; i++ )	for ( i = 0; bv[i] != NULL; i++ )
ber_bvfree( bv[i] );	ber_bvfree( bv[i] );
free( (char *) bv );	free( (char *) bv );
}	}

struct berval *	struct berval *
ber_bvdup( struct berval *bv )	ber_bvdup(
	LDAP_CONST struct berval *bv )
{	{
struct berval *new;	struct berval *new;

	assert( bv != NULL );

	if( bv == NULL ) {
	return NULL;
	}

if ( (new = (struct berval *) malloc( sizeof(struct berval) ))	if ( (new = (struct berval *) malloc( sizeof(struct berval) ))
== NULL ) {	== NULL ) {
return( NULL );	return( NULL );
Line 744 void	Line 790 void
ber_set_string_translators( BerElement *ber, BERTranslateProc encode_proc,	ber_set_string_translators( BerElement *ber, BERTranslateProc encode_proc,
BERTranslateProc decode_proc )	BERTranslateProc decode_proc )
{	{
	assert( ber != NULL );

ber->ber_encode_translate_proc = encode_proc;	ber->ber_encode_translate_proc = encode_proc;
ber->ber_decode_translate_proc = decode_proc;	ber->ber_decode_translate_proc = decode_proc;
}	}

Removed from v.1.19
changed lines
	Added in v.1.20