--- libraries/liblber/decode.c	1998/09/28 17:27:54	1.4.10.4
+++ libraries/liblber/decode.c	1998/12/31 19:32:05	1.5.2.4
@@ -1,5 +1,9 @@
 /* decode.c - ber input decoding routines */
 /*
+ * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
+/* Portions
  * Copyright (c) 1990 Regents of the University of Michigan.
  * All rights reserved.
  *
@@ -11,34 +15,15 @@
  * is provided ``as is'' without express or implied warranty.
  */
 
-#define DISABLE_BRIDGE /* disable LDAP_BRIDGE code */
 #include "portable.h"
 
 #include <stdio.h>
-
-#ifdef STDC_HEADERS
 #include <stdlib.h>
-#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
 
-#include <ac/string.h>
+#include <ac/stdarg.h>
 
-#ifdef MACOS
-#include "macos.h"
-#endif /* MACOS */
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-
-#ifdef PCNFS
-#include <tklib.h>
-#endif /* PCNFS */
-#if defined( DOS ) || defined( _WIN32 )
-#include "msdos.h"
-#endif /* DOS */
+#include <ac/string.h>
+#include <ac/socket.h>
 
 #include "lber.h"
 
@@ -55,7 +40,7 @@ ber_get_tag( BerElement *ber )
 	unsigned char	xbyte;
 	unsigned long	tag;
 	char		*tagp;
-	int		i;
+	unsigned int	i;
 
 	if ( ber_read( ber, (char *) &xbyte, 1 ) != 1 )
 		return( LBER_DEFAULT );
@@ -126,7 +111,7 @@ ber_skip_tag( BerElement *ber, unsigned
 		if ( ber_read( ber, (char *) &netlen + diff, noctets )
 		    != noctets )
 			return( LBER_DEFAULT );
-		*len = LBER_NTOHL( netlen );
+		*len = AC_NTOHL( netlen );
 	} else {
 		*len = lc;
 	}
@@ -175,10 +160,10 @@ ber_getnint( BerElement *ber, long *num,
         sign = (0x80 & *(p+diff) );
         if ( sign && len < sizeof(long) ) {
                 for ( i = 0; i < diff; i++ ) {
-                        *(p+i) = 0xff;
+                        *(p+i) = (unsigned char) 0xff;
 		}
 	}
-	*num = LBER_NTOHL( netnum );
+	*num = AC_NTOHL( netnum );
 
 	return( len );
 }
@@ -191,7 +176,7 @@ ber_get_int( BerElement *ber, long *num
 	if ( (tag = ber_skip_tag( ber, &len )) == LBER_DEFAULT )
 		return( LBER_DEFAULT );
 
-	if ( ber_getnint( ber, num, (int)len ) != len )
+	if ( (unsigned long) ber_getnint( ber, num, (int)len ) != len )
 		return( LBER_DEFAULT );
 	else
 		return( tag );
@@ -210,7 +195,7 @@ ber_get_stringb( BerElement *ber, char *
 	if ( datalen > (*len - 1) )
 		return( LBER_DEFAULT );
 
-	if ( ber_read( ber, buf, datalen ) != datalen )
+	if ( (unsigned long) ber_read( ber, buf, datalen ) != datalen )
 		return( LBER_DEFAULT );
 
 	buf[datalen] = '\0';
@@ -249,7 +234,7 @@ ber_get_stringa( BerElement *ber, char *
 	if ( (*buf = (char *) malloc( (size_t)datalen + 1 )) == NULL )
 		return( LBER_DEFAULT );
 
-	if ( ber_read( ber, *buf, datalen ) != datalen )
+	if ( (unsigned long) ber_read( ber, *buf, datalen ) != datalen )
 		return( LBER_DEFAULT );
 	(*buf)[datalen] = '\0';
 
@@ -282,7 +267,7 @@ ber_get_stringal( BerElement *ber, struc
 	if ( ((*bv)->bv_val = (char *) malloc( (size_t)len + 1 )) == NULL )
 		return( LBER_DEFAULT );
 
-	if ( ber_read( ber, (*bv)->bv_val, len ) != len )
+	if ( (unsigned long) ber_read( ber, (*bv)->bv_val, len ) != len )
 		return( LBER_DEFAULT );
 	((*bv)->bv_val)[len] = '\0';
 	(*bv)->bv_len = len;
@@ -319,7 +304,7 @@ ber_get_bitstringa( BerElement *ber, cha
 	if ( ber_read( ber, (char *)&unusedbits, 1 ) != 1 )
 		return( LBER_DEFAULT );
 
-	if ( ber_read( ber, *buf, datalen ) != datalen )
+	if ( (unsigned long) ber_read( ber, *buf, datalen ) != datalen )
 		return( LBER_DEFAULT );
 
 	*blen = datalen * 8 - unusedbits;
@@ -382,7 +367,7 @@ ber_next_element( BerElement *ber, unsig
 /* VARARGS */
 unsigned long
 ber_scanf
-#ifdef STDC_HEADERS
+#if HAVE_STDARG
 	( BerElement *ber, char *fmt, ... )
 #else
 	( va_alist )
@@ -390,7 +375,7 @@ va_dcl
 #endif
 {
 	va_list		ap;
-#ifndef STDC_HEADERS
+#ifndef HAVE_STDARG
 	BerElement	*ber;
 	char		*fmt;
 #endif
@@ -398,10 +383,10 @@ va_dcl
 	char		*s, **ss, ***sss;
 	struct berval 	***bv, **bvp, *bval;
 	int		*i, j;
-	long		*l, rc, tag;
-	unsigned long	len;
+	long		*l;
+	unsigned long	rc, tag, len;
 
-#if STDC_HEADERS
+#ifdef HAVE_STDARG
 	va_start( ap, fmt );
 #else
 	va_start( ap );