From: Kurt Spanier <ksp@openldap.org>
Date: Wed, 7 Apr 1999 13:15:51 +0000 (+0000)
Subject: Next try to fix the core dump problem on FreeBSD: eliminate ldbm_datum_free(),
X-Git-Tag: OPENLDAP_SLAPD_BACK_LDAP~227
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=85df05d3d681236c6bf31b0d1a663d54b9f508e6;p=openldap

Next try to fix the core dump problem on FreeBSD: eliminate ldbm_datum_free(),
because it's already done in ldbm_nextkey().
---

diff --git a/servers/slapd/tools/ldbmcat.c b/servers/slapd/tools/ldbmcat.c
index 0538001735..bfdfffa983 100644
--- a/servers/slapd/tools/ldbmcat.c
+++ b/servers/slapd/tools/ldbmcat.c
@@ -19,7 +19,7 @@ usage( char *name )
 int
 main( int argc, char **argv )
 {
-        Datum                key, last, data;
+        Datum               key, data;
         LDBM                dbp;
         char                *file, *s;
         int                printid = 1;
@@ -29,7 +29,6 @@ main( int argc, char **argv )
 #endif
 
         ldbm_datum_init( key );
-        ldbm_datum_init( last );
         ldbm_datum_init( data );
 
         if ( argc < 2 || argc > 3 || ( argc == 3 && strcmp( argv[1], "-n" )
@@ -48,14 +47,12 @@ main( int argc, char **argv )
                 exit ( 1 );
         }
 
-        last.dptr = NULL;
-
 #ifdef HAVE_BERKELEY_DB2
         for ( key = ldbm_firstkey( dbp, &cursorp ); key.dptr != NULL;
-            key = ldbm_nextkey( dbp, last, cursorp ) )
+            key = ldbm_nextkey( dbp, key, cursorp ) )
 #else
         for ( key = ldbm_firstkey( dbp ); key.dptr != NULL;
-            key = ldbm_nextkey( dbp, last ) )
+            key = ldbm_nextkey( dbp, key ) )
 #endif
         {
                 data = ldbm_fetch( dbp, key );
@@ -76,12 +73,7 @@ main( int argc, char **argv )
                 } else {
 
 				}
-
-                ldbm_datum_free( dbp, last );
-                last = key;
-
         }
-        ldbm_datum_free( dbp, last );
         ldbm_close( dbp );
 
         exit( 0 );