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

[openldap] / libraries / liblber / bprint.c

diff --git a/libraries/liblber/bprint.c b/libraries/liblber/bprint.c
index 5d7a6250f0672026fca709ac9a1e49c16854a582..8f80f9f0a38ed0a7773cebe9e2912a506d0917f2 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-2003 The OpenLDAP Foundation.
+ * Copyright 1998-2012 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -229,81 +229,6 @@ ber_bprint(
        (*ber_pvt_log_print)( line );
 }
 
-#ifdef NEW_LOGGING
-int ber_output_dump(
-       const char *subsys,
-       int level,
-       BerElement *ber,
-       int inout )
-{
-    static const char  hexdig[] = "0123456789abcdef";
-    char buf[132];
-    ber_len_t len;
-    char       line[ BP_LEN ];
-    ber_len_t i;
-    char *data = ber->ber_ptr;
-
-    if ( inout == 1 ) {
-        len = ber_pvt_ber_remaining(ber);
-    } else {
-        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,
-             (long) len );
-
-    (void) ber_pvt_log_output( subsys, level, "%s", buf );
-
-#define BP_OFFSET 9
-#define BP_GRAPH 60
-#define BP_LEN 80
-
-    assert( data != NULL );
-        
-    /* in case len is zero */
-    line[0] = '\n';
-    line[1] = '\0';
-       
-    for ( i = 0 ; i < len ; i++ ) {
-        int n = i % 16;
-        unsigned off;
-        
-        if( !n ) {
-            if( i ) {
-                               (void) ber_pvt_log_output( subsys, level, "%s", line );
-                       }
-            memset( line, ' ', sizeof(line)-2 );
-            line[sizeof(line)-2] = '\n';
-            line[sizeof(line)-1] = '\0';
-            
-            off = i % 0x0ffffU;
-
-            line[2] = hexdig[0x0f & (off >> 12)];
-            line[3] = hexdig[0x0f & (off >>  8)];
-            line[4] = hexdig[0x0f & (off >>  4)];
-            line[5] = hexdig[0x0f & off ];
-            line[6] = ':';
-        }
-
-        off = BP_OFFSET + n*3 + ((n >= 8)?1:0);
-        line[off] = hexdig[ 0x0f & ( data[i] >> 4 ) ];
-        line[off+1] = hexdig[ 0x0f & data[i] ];
-        
-        off = BP_GRAPH + n + ((n >= 8)?1:0);
-        
-        if ( isprint( (unsigned char) data[i] )) {
-            line[BP_GRAPH + n] = data[i];
-        } else {
-            line[BP_GRAPH + n] = '.';
-        }
-    }
-
-    return ber_pvt_log_output( subsys, level, "%s", line );
-}
-#endif
 
 int
 ber_log_dump(
@@ -340,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 );
@@ -351,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" );
 }