Merge remote-tracking branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_4

[openldap] / libraries / liblber / bprint.c

diff --git a/libraries/liblber/bprint.c b/libraries/liblber/bprint.c
index 46fcae994a0efe8019c32b62cb028abfdb9b5ada..5d55628549586b9eee80623f8a4653c2cac0809e 100644 (file)
--- a/libraries/liblber/bprint.c
+++ b/libraries/liblber/bprint.c
@@ -1,7 +1,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2004 The OpenLDAP Foundation.
+ * Copyright 1998-2013 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -265,10 +265,10 @@ ber_dump(
                len = ber_pvt_ber_write(ber);
        }
 
-       sprintf( buf, "ber_dump: buf=0x%08lx ptr=0x%08lx end=0x%08lx len=%ld\n",
-           (long) ber->ber_buf,
-               (long) ber->ber_ptr,
-               (long) ber->ber_end,
+       sprintf( buf, "ber_dump: buf=%p ptr=%p end=%p len=%ld\n",
+               ber->ber_buf,
+               ber->ber_ptr,
+               ber->ber_end,
                (long) len );
 
        (void) (*ber_pvt_log_print)( buf );
@@ -276,47 +276,21 @@ ber_dump(
        ber_bprint( ber->ber_ptr, len );
 }
 
+typedef struct seqorset Seqorset;
+
+/* Exists for binary compatibility with OpenLDAP 2.4.17-- */
 int
 ber_log_sos_dump(
        int errlvl,
        int loglvl,
        Seqorset *sos )
 {
-       assert( sos != NULL );
-
-       if ( !ber_log_check( errlvl, loglvl )) {
-               return 0;
-       }
-
-       ber_sos_dump( sos );
-       return 1;
+       return 0;
 }
 
+/* Exists for binary compatibility with OpenLDAP 2.4.17-- */
 void
 ber_sos_dump(
        Seqorset *sos )
 {
-       char buf[132];
-
-       assert( sos != NULL );
-
-       (*ber_pvt_log_print)( "*** sos dump ***\n" );
-
-       while ( sos != NULL ) {
-               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 );
-               (*ber_pvt_log_print)( buf );
-
-               sprintf( buf, "              current len %ld contents:\n",
-                   (long) (sos->sos_ptr - sos->sos_first) );
-               (*ber_pvt_log_print)( buf );
-
-               ber_bprint( sos->sos_first, sos->sos_ptr - sos->sos_first );
-
-               sos = sos->sos_next;
-       }
-
-       (*ber_pvt_log_print)( "*** end dump ***\n" );
 }