Fix text2time to handle 4 digit years. Fix YEAR() to handle

[openldap] / libraries / liblber / bprint.c

diff --git a/libraries/liblber/bprint.c b/libraries/liblber/bprint.c
index a326ac640b04c2314b610b10cab7a964d6fdd251..136d3d4a0bff4d22f9396f3a7c43951568864a2b 100644 (file)
--- a/libraries/liblber/bprint.c
+++ b/libraries/liblber/bprint.c
@@ -1,3 +1,7 @@
+/*
+ * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
 
 #include "portable.h"
 
@@ -13,12 +17,14 @@
  * Print stuff
  */
 static void
-lber_print_error( char *data )
+lber_error_print( char *data )
 {
        fputs( data, stderr );
        fflush( stderr );
 }
 
+BER_LOG_PRINT_FN lber_pvt_log_print = lber_error_print;
+
 /*
  * lber log 
  */
@@ -28,7 +34,7 @@ static int lber_log_check( int errlvl, int loglvl )
        return errlvl & loglvl ? 1 : 0;
 }
 
-int lber_log_printf
+int lber_pvt_log_printf
 #ifdef HAVE_STDARG
        (int errlvl, int loglvl, char *fmt, ...)
 #else
@@ -68,7 +74,7 @@ va_dcl
 
        va_end(ap);
 
-       lber_print_error( buf );
+       (*lber_pvt_log_print)( buf );
        return 1;
 }
 
@@ -78,7 +84,7 @@ static int lber_log_puts(int errlvl, int loglvl, char *buf)
                return 0;
        }
 
-       lber_print_error( buf );
+       (*lber_pvt_log_print)( buf );
        return 1;
 }
 
@@ -110,7 +116,7 @@ ber_bprint(char *data, int len )
     for ( ;; ) {
        if ( len < 1 ) {
            sprintf( buf, "\t%s\n", ( i == 0 ) ? "(end)" : out );
-               lber_print_error( buf );
+               (*lber_pvt_log_print)( buf );
            break;
        }
 
@@ -132,7 +138,7 @@ ber_bprint(char *data, int len )
        if ( i > BPLEN - 2 ) {
                char data[128 + BPLEN];
            sprintf( data, "\t%s\n", out );
-               lber_print_error(data);
+               (*lber_pvt_log_print)(data);
            memset( out, 0, BPLEN );
            i = 0;
            continue;
@@ -162,7 +168,7 @@ ber_dump( BerElement *ber, int inout )
                (long) ber->ber_ptr,
                (long) ber->ber_end );
 
-       lber_print_error( buf );
+       (*lber_pvt_log_print)( buf );
 
        if ( inout == 1 ) {
                sprintf( buf, "          current len %ld, contents:\n",
@@ -193,22 +199,22 @@ ber_sos_dump( Seqorset *sos )
 {
        char buf[132];
 
-       lber_print_error( "*** sos dump ***\n" );
+       (*lber_pvt_log_print)( "*** sos dump ***\n" );
 
        while ( sos != NULLSEQORSET ) {
                sprintf( buf, "ber_sos_dump: clen %ld first 0x%lx ptr 0x%lx\n",
                    (long) sos->sos_clen, (long) sos->sos_first, (long) sos->sos_ptr );
-               lber_print_error( buf );
+               (*lber_pvt_log_print)( buf );
 
                sprintf( buf, "              current len %ld contents:\n",
                    (long) (sos->sos_ptr - sos->sos_first) );
-               lber_print_error( buf );
+               (*lber_pvt_log_print)( buf );
 
                ber_bprint( sos->sos_first, sos->sos_ptr - sos->sos_first );
 
                sos = sos->sos_next;
        }
 
-       lber_print_error( "*** end dump ***\n" );
+       (*lber_pvt_log_print)( "*** end dump ***\n" );
 }