From 7e5cea4a5eeb3eb44179234af86ffa2a696ceded Mon Sep 17 00:00:00 2001
From: Kurt Zeilenga <kurt@openldap.org>
Date: Fri, 8 Jan 1999 20:26:46 +0000
Subject: [PATCH] Unwrap ldbm_datum_init()
---
servers/slapd/back-ldbm/id2children.c | 5 -----
servers/slapd/back-ldbm/idl.c | 5 -----
servers/slapd/tools/ldbmcat.c | 2 +-
servers/slapd/tools/ldbmtest.c | 2 +-
4 files changed, 2 insertions(+), 12 deletions(-)
diff --git a/servers/slapd/back-ldbm/id2children.c b/servers/slapd/back-ldbm/id2children.c
index 171e6c2618..aa8a79cecd 100644
--- a/servers/slapd/back-ldbm/id2children.c
+++ b/servers/slapd/back-ldbm/id2children.c
@@ -23,12 +23,7 @@ id2children_add(
IDList *idl;
char buf[20];
-#ifdef HAVE_BERKELEY_DB2
- Datum data;
-
ldbm_datum_init( key );
- ldbm_datum_init( data );
-#endif
Debug( LDAP_DEBUG_TRACE, "=> id2children_add( %lu, %lu )\n",
p ? p->e_id : 0, e->e_id, 0 );
diff --git a/servers/slapd/back-ldbm/idl.c b/servers/slapd/back-ldbm/idl.c
index ee5e316071..7a4f7d075e 100644
--- a/servers/slapd/back-ldbm/idl.c
+++ b/servers/slapd/back-ldbm/idl.c
@@ -56,12 +56,7 @@ idl_fetch_one(
Datum data;
IDList *idl;
-#ifdef HAVE_BERKELEY_DB2
- Datum k2;
-
ldbm_datum_init( data );
- ldbm_datum_init( k2 );
-#endif
/* Debug( LDAP_DEBUG_TRACE, "=> idl_fetch_one\n", 0, 0, 0 ); */
diff --git a/servers/slapd/tools/ldbmcat.c b/servers/slapd/tools/ldbmcat.c
index 6f2ea10340..f7e62c7d31 100644
--- a/servers/slapd/tools/ldbmcat.c
+++ b/servers/slapd/tools/ldbmcat.c
@@ -28,11 +28,11 @@ main( int argc, char **argv )
#ifdef HAVE_BERKELEY_DB2
DBC *cursorp;
+#endif
ldbm_datum_init( key );
ldbm_datum_init( last );
ldbm_datum_init( data );
-#endif
if ( argc < 2 || argc > 3 || ( argc == 3 && strcmp( argv[1], "-n" )
!= 0 )) {
diff --git a/servers/slapd/tools/ldbmtest.c b/servers/slapd/tools/ldbmtest.c
index 70989a013a..4811584cc0 100644
--- a/servers/slapd/tools/ldbmtest.c
+++ b/servers/slapd/tools/ldbmtest.c
@@ -70,12 +70,12 @@ main( int argc, char **argv )
#ifdef HAVE_BERKELEY_DB2
DBC *cursorp;
+#endif
ldbm_datum_init( savekey );
ldbm_datum_init( key );
ldbm_datum_init( data );
ldbm_datum_init( last );
-#endif
tailorfile = SLAPD_DEFAULT_CONFIGFILE;
while ( (i = getopt( argc, argv, "d:f:" )) != EOF ) {
--
GitLab