X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Flibldap%2Fprint.c;h=bbd21b36e1f99aba83939c6a559f37942db6fd9c;hb=70092b38fb23b9141a2b8414fb5a9c5200f3c12d;hp=4b865b7b4884338b718228aef80a88f5e11bd667;hpb=7eec2674364993167a2b2495d1aefb84809a5386;p=openldap

diff --git a/libraries/libldap/print.c b/libraries/libldap/print.c
index 4b865b7b48..bbd21b36e1 100644
--- a/libraries/libldap/print.c
+++ b/libraries/libldap/print.c
@@ -1,5 +1,6 @@
+/* $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
  */
 
@@ -14,8 +15,6 @@
 
 #include "ldap-int.h"
 
-extern BER_LOG_PRINT_FN lber_log_print;
-
 /*
  * ldap log 
  */
@@ -27,41 +26,23 @@ static int ldap_log_check( LDAP *ld, int loglvl )
 	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 );
@@ -74,16 +55,6 @@ va_dcl
 
 	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;
 }