Import minor trace output cleanup

[openldap] / servers / slapd / tools / ldif2id2entry.c

diff --git a/servers/slapd/tools/ldif2id2entry.c b/servers/slapd/tools/ldif2id2entry.c
index 70653f0edb23faef79c460bc7693cc82155efb7c..96ed84ffe3c34e1e4cf8ba25db158c9c748cb06f 100644 (file)
--- a/servers/slapd/tools/ldif2id2entry.c
+++ b/servers/slapd/tools/ldif2id2entry.c
@@ -14,24 +14,6 @@
 
 #define MAXARGS                100
 
-int            ldap_debug;
-int            ldap_syslog;
-int            ldap_syslog_level;
-long           num_entries_sent;
-long           num_bytes_sent;
-int            active_threads;
-char           *default_referral;
-time_t         currenttime;
-pthread_t      listener_tid;
-pthread_mutex_t        num_sent_mutex;
-pthread_mutex_t        entry2str_mutex;
-pthread_mutex_t        active_threads_mutex;
-pthread_mutex_t        new_conn_mutex;
-pthread_mutex_t        currenttime_mutex;
-pthread_mutex_t        replog_mutex;
-pthread_mutex_t        ops_mutex;
-pthread_mutex_t        regex_mutex;
-
 static char    *tailorfile;
 static char    *inputfile;
  
@@ -144,8 +126,8 @@ main( int argc, char **argv )
                int             vlen;
                Datum           key, data;
 
-               memset( &key, 0, sizeof( key ));
-               memset( &data, 0, sizeof( data ));
+               ldbm_datum_init( key );
+               ldbm_datum_init( data );
 
                if ( fgets( line, sizeof(line), stdin ) != NULL ) {
                        int     len, idlen;