+/* $OpenLDAP$ */
/*
- * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
* COPYING RESTRICTIONS APPLY, see COPYRIGHT file
*/
#include "ldap-int.h"
-extern BER_LOG_PRINT_FN lber_log_print;
-
/*
* ldap log
*/
if(ld == NULL) {
errlvl = ldap_debug;
} else {
- errlvl = ld->ld_errno;
+ errlvl = ld->ld_debug;
}
return errlvl & loglvl ? 1 : 0;
}
-int ldap_log_printf
-#ifdef HAVE_STDARG
- ( LDAP *ld, int loglvl, char *fmt, ... )
-#else
- ( va_alist )
-va_dcl
-#endif
+int ldap_log_printf( LDAP *ld, int loglvl, const char *fmt, ... )
{
char buf[ 1024 ];
va_list ap;
-#ifdef HAVE_STDARG
- va_start( ap, fmt );
-#else
- LD *ld
- int loglvl;
- char *fmt;
-
- va_start( ap );
-
- errlvl = va_arg( ap, LD * );
- loglvl = va_arg( ap, int );
- fmt = va_arg( ap, char * );
-#endif
-
if ( !ldap_log_check( ld, loglvl )) {
return 0;
}
+ va_start( ap, fmt );
+
#ifdef HAVE_VSNPRINTF
buf[sizeof(buf) - 1] = '\0';
vsnprintf( buf, sizeof(buf)-1, fmt, ap );
va_end(ap);
- (*lber_log_print)( buf );
- return 1;
-}
-
-static int lber_log_puts(int errlvl, int loglvl, char *buf)
-{
- if ( !ldap_log_check( errlvl, loglvl )) {
- return 0;
- }
-
- (*lber_log_print)( buf );
+ (*ber_pvt_log_print)( buf );
return 1;
}