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.5.2.4 and 1.6

version 1.5.2.4, 1998/12/31 19:32:05	version 1.6, 1998/10/26 00:18:42
Line 1	Line 1
/* decode.c - ber input decoding routines */	/* 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.	* Copyright (c) 1990 Regents of the University of Michigan.
* All rights reserved.	* All rights reserved.
*	*
Line 18	Line 14
#include "portable.h"	#include "portable.h"

#include <stdio.h>	#include <stdio.h>
#include <stdlib.h>

#include <ac/stdarg.h>	#ifdef STDC_HEADERS
	#include <stdlib.h>
	#include <stdarg.h>
	#else
	#include <varargs.h>
	#endif

#include <ac/string.h>	#include <ac/string.h>
#include <ac/socket.h>	#include <ac/socket.h>

#include "lber.h"	#include "lber-int.h"

#ifdef LDAP_DEBUG	#ifdef LDAP_DEBUG
int lber_debug;	int lber_debug;
Line 40 ber_get_tag( BerElement *ber )	Line 40 ber_get_tag( BerElement *ber )
unsigned char xbyte;	unsigned char xbyte;
unsigned long tag;	unsigned long tag;
char *tagp;	char *tagp;
unsigned int i;	int i;

if ( ber_read( ber, (char *) &xbyte, 1 ) != 1 )	if ( ber_read( ber, (char *) &xbyte, 1 ) != 1 )
return( LBER_DEFAULT );	return( LBER_DEFAULT );
Line 367 ber_next_element( BerElement *ber, unsig	Line 367 ber_next_element( BerElement *ber, unsig
/* VARARGS */	/* VARARGS */
unsigned long	unsigned long
ber_scanf	ber_scanf
#if HAVE_STDARG	#ifdef STDC_HEADERS
( BerElement ber, char fmt, ... )	( BerElement ber, char fmt, ... )
#else	#else
( va_alist )	( va_alist )
Line 375 va_dcl	Line 375 va_dcl
#endif	#endif
{	{
va_list ap;	va_list ap;
#ifndef HAVE_STDARG	#ifndef STDC_HEADERS
BerElement *ber;	BerElement *ber;
char *fmt;	char *fmt;
#endif	#endif
Line 383 va_dcl	Line 383 va_dcl
char s, ss, **sss;	char s, ss, **sss;
struct berval *bv, bvp, *bval;	struct berval *bv, bvp, *bval;
int *i, j;	int *i, j;
long *l;	long *l, rc, tag;
unsigned long rc, tag, len;	unsigned long len;

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

Removed from v.1.5.2.4
changed lines
	Added in v.1.6