--- libraries/liblber/decode.c 1998/10/24 23:41:55 1.5 +++ 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. * @@ -14,13 +18,9 @@ #include "portable.h" #include - -#ifdef STDC_HEADERS #include -#include -#else -#include -#endif + +#include #include #include @@ -40,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 ); @@ -367,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 ) @@ -375,7 +375,7 @@ va_dcl #endif { va_list ap; -#ifndef STDC_HEADERS +#ifndef HAVE_STDARG BerElement *ber; char *fmt; #endif @@ -383,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 );