X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Flibldap%2Fprint.c;h=c83eac733091e5aaa1aaaff6ba3cbdf9d62b41b5;hb=d9a60db75ea1dbbc06d90d15e6f6969d8c075ee7;hp=f8203c1604def10e36157f19abad00dd34caee2a;hpb=dc07e765f263ef459dcd2afd1ece01cfc85a0edd;p=openldap
diff --git a/libraries/libldap/print.c b/libraries/libldap/print.c
index f8203c1604..c83eac7330 100644
--- a/libraries/libldap/print.c
+++ b/libraries/libldap/print.c
@@ -1,6 +1,16 @@
-/*
- * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* $OpenLDAP$ */
+/* This work is part of OpenLDAP Software .
+ *
+ * Copyright 1998-2011 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * .
*/
#include "portable.h"
@@ -25,50 +35,25 @@ 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, const 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
- LDAP *ld;
- int loglvl;
- char *fmt;
-
- va_start( ap );
-
- ld = va_arg( ap, LDAP * );
- loglvl = va_arg( ap, int );
- fmt = va_arg( ap, char * );
-#endif
-
if ( !ldap_log_check( ld, loglvl )) {
return 0;
}
-#ifdef HAVE_VSNPRINTF
+ va_start( ap, fmt );
+
buf[sizeof(buf) - 1] = '\0';
vsnprintf( buf, sizeof(buf)-1, fmt, ap );
-#elif HAVE_VSPRINTF
- vsprintf( buf, fmt, ap ); /* hope it's not too long */
-#else
- /* use doprnt() */
- chokeme = "choke me! I don't have a doprnt manual handy!";
-#endif
va_end(ap);