--- libraries/liblber/decode.c	1999/06/18 21:53:07	1.34
+++ libraries/liblber/decode.c	1999/11/08 14:43:12	1.41
@@ -1,4 +1,5 @@
 /* decode.c - ber input decoding routines */
+/* $OpenLDAP: pkg/ldap/libraries/liblber/decode.c,v 1.40 1999/11/08 14:39:00 kdz Exp $ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
@@ -30,7 +31,7 @@
 
 #include "lber-int.h"
 
-static ber_tag_t ber_getnint LDAP_P((
+static ber_len_t ber_getnint LDAP_P((
 	BerElement *ber,
 	ber_int_t *num,
 	ber_len_t len ));
@@ -107,7 +108,7 @@ ber_skip_tag( BerElement *ber, ber_len_t
 	 * Next, read the length.  The first byte contains the length of
 	 * the length.  If bit 8 is set, the length is the long form,
 	 * otherwise it's the short form.  We don't allow a length that's
-	 * greater than what we can hold in an unsigned long.
+	 * greater than what we can hold in a ber_len_t.
 	 */
 
 	*len = netlen = 0;
@@ -131,30 +132,28 @@ ber_skip_tag( BerElement *ber, ber_len_t
 
 ber_tag_t
 ber_peek_tag(
-	LDAP_CONST BerElement *ber_in,
+	BerElement *ber_in,
 	ber_len_t *len )
 {
-	ber_tag_t	tag;
+	char*	save;
 	BerElement *ber;
+	ber_tag_t tag;
 
 	assert( ber_in != NULL );
 	assert( BER_VALID( ber_in ) );
 
-	ber = ber_dup( ber_in );
-
-	if( ber == NULL ) {
-		return LBER_ERROR;
-	}
-
-	assert( BER_VALID( ber ) );
+	/* save state */
+	save = ber->ber_ptr;
 
 	tag = ber_skip_tag( ber, len );
 
-	ber_free( ber, 0 );
+	/* restore state */
+	ber->ber_ptr = save;
+
 	return( tag );
 }
 
-static ber_tag_t
+static ber_len_t
 ber_getnint(
 	BerElement *ber,
 	ber_int_t *num,
@@ -178,7 +177,7 @@ ber_getnint(
 		return( -1 );
 
 	/* read into the low-order bytes of our buffer */
-	if ( (ber_len_t) ber_read( ber, buf, len ) != len ) {
+	if ( (ber_len_t) ber_read( ber, (char *) buf, len ) != len ) {
 		return( -1 );
 	}
 
@@ -215,7 +214,7 @@ ber_get_int(
 	if ( (tag = ber_skip_tag( ber, &len )) == LBER_DEFAULT )
 		return( LBER_DEFAULT );
 
-	if ( (unsigned long) ber_getnint( ber, num, len ) != len )
+	if ( ber_getnint( ber, num, len ) != len )
 		return( LBER_DEFAULT );
 	else
 		return( tag );
@@ -242,7 +241,7 @@ ber_get_stringb(
 	if ( datalen > (*len - 1) )
 		return( LBER_DEFAULT );
 
-	if ( (unsigned long) ber_read( ber, buf, datalen ) != datalen )
+	if ( (ber_len_t) ber_read( ber, buf, datalen ) != datalen )
 		return( LBER_DEFAULT );
 
 	buf[datalen] = '\0';
@@ -289,7 +288,7 @@ ber_get_stringa( BerElement *ber, char *
 	if ( (*buf = (char *) LBER_MALLOC( datalen + 1 )) == NULL )
 		return( LBER_DEFAULT );
 
-	if ( (unsigned long) ber_read( ber, *buf, datalen ) != datalen ) {
+	if ( (ber_len_t) ber_read( ber, *buf, datalen ) != datalen ) {
 		LBER_FREE( *buf );
 		*buf = NULL;
 		return( LBER_DEFAULT );
@@ -393,7 +392,7 @@ ber_get_bitstringa(
 		return( LBER_DEFAULT );
 	}
 
-	if ( (unsigned long) ber_read( ber, *buf, datalen ) != datalen ) {
+	if ( (ber_len_t) ber_read( ber, *buf, datalen ) != datalen ) {
 		LBER_FREE( buf );
 		*buf = NULL;
 		return( LBER_DEFAULT );
@@ -452,8 +451,7 @@ ber_first_element(
 
 	/* skip the sequence header, use the len to mark where to stop */
 	if ( ber_skip_tag( ber, len ) == LBER_DEFAULT ) {
-		*last = NULL;
-		return( LBER_DEFAULT );
+		return( LBER_ERROR );
 	}
 
 	*last = ber->ber_ptr + *len;
@@ -469,7 +467,7 @@ ber_tag_t
 ber_next_element(
 	BerElement *ber,
 	ber_len_t *len,
-	char *last )
+	LDAP_CONST char *last )
 {
 	assert( ber != NULL );
 	assert( len != NULL );
@@ -478,6 +476,7 @@ ber_next_element(
 	assert( BER_VALID( ber ) );
 
 	if ( ber->ber_ptr == last ) {
+		/* set last to NULL on end of SEQUENCE */
 		return( LBER_DEFAULT );
 	}
 
@@ -486,21 +485,11 @@ ber_next_element(
 
 /* VARARGS */
 ber_tag_t
-ber_scanf
-#if HAVE_STDARG
-	( BerElement *ber,
+ber_scanf ( BerElement *ber,
 	LDAP_CONST char *fmt,
 	... )
-#else
-	( va_alist )
-va_dcl
-#endif
 {
 	va_list		ap;
-#ifndef HAVE_STDARG
-	BerElement	*ber;
-	char		*fmt;
-#endif
 	LDAP_CONST char		*fmt_reset;
 	char		*last;
 	char		*s, **ss, ***sss;
@@ -512,13 +501,7 @@ va_dcl
 	ber_tag_t	rc, tag;
 	ber_len_t	len;
 
-#ifdef HAVE_STDARG
 	va_start( ap, fmt );
-#else
-	va_start( ap );
-	ber = va_arg( ap, BerElement * );
-	fmt = va_arg( ap, char * );
-#endif
 
 	assert( ber != NULL );
 	assert( fmt != NULL );
@@ -672,13 +655,7 @@ va_dcl
 	     * Error.  Reclaim malloced memory that was given to the caller.
 	     * Set allocated pointers to NULL, "data length" outvalues to 0.
 	     */
-#ifdef HAVE_STDARG
 	    va_start( ap, fmt );
-#else
-	    va_start( ap );
-	    (void) va_arg( ap, BerElement * );
-	    (void) va_arg( ap, char * );
-#endif
 
 	    for ( ; fmt_reset < fmt; fmt_reset++ ) {
 		switch ( *fmt_reset ) {