#include <ac/string.h>
#include <ac/socket.h>
-#include "slap.h"
#include "ldapconfig.h"
+#include "slap.h"
#include "back-ldbm.h"
-extern Datum ldbm_cache_fetch();
-
IDList *
idl_alloc( int nids )
{
Datum data;
IDList *idl;
-#ifdef HAVE_BERKELEY_DB2
- Datum k2;
- memset( &k2, 0, sizeof( k2 ) );
- memset( &data, 0, sizeof( data ) );
-#endif
+ ldbm_datum_init( data );
/* Debug( LDAP_DEBUG_TRACE, "=> idl_fetch_one\n", 0, 0, 0 ); */
char *kstr;
int i, nids;
-#ifdef HAVE_BERKELEY_DB2
- memset( &k2, 0, sizeof( k2 ) );
- memset( &data, 0, sizeof( data ) );
-#endif
+ ldbm_datum_init( k2 );
+ ldbm_datum_init( data );
/* Debug( LDAP_DEBUG_TRACE, "=> idl_fetch\n", 0, 0, 0 ); */
}
free( (char *) tmp );
- Debug( LDAP_DEBUG_TRACE, "<= idl_fetch %d ids (%d max)\n", idl->b_nids,
- idl->b_nmax, 0 );
+ Debug( LDAP_DEBUG_TRACE, "<= idl_fetch %lu ids (%lu max)\n",
+ idl->b_nids, idl->b_nmax, 0 );
return( idl );
}
Datum data;
struct ldbminfo *li = (struct ldbminfo *) be->be_private;
-#ifdef HAVE_BERKELEY_DB2
- memset( &data, 0, sizeof( data ) );
-#endif
+ ldbm_datum_init( data );
/* Debug( LDAP_DEBUG_TRACE, "=> idl_store\n", 0, 0, 0 ); */
char *kstr;
Datum k2;
-#ifdef HAVE_BERKELEY_DB2
- memset( &k2, 0, sizeof( k2 ) );
-#endif
+ ldbm_datum_init( k2 );
if ( (idl = idl_fetch_one( be, db, key )) == NULL ) {
#ifdef LDBM_DEBUG
case 0: /* id inserted */
if ( rc == 2 ) {
Debug( LDAP_DEBUG_ANY,
- "id %d already in next block\n",
+ "id %lu already in next block\n",
id, 0, 0 );
}
free( kstr );
{
Datum k2;
IDList *idl, *tmp;
- int i, j, nids;
+ unsigned i;
+ int j, nids;
char *kstr;
if ( (idl = idl_fetch_one( be, db, key ) ) == NULL )
kstr = (char *) ch_malloc( key.dsize + 20 );
for ( j = 0; idl->b_ids[j] != NOID; j++ )
{
- memset( &k2, 0, sizeof(k2) );
- sprintf( kstr, "%c%s%d", CONT_PREFIX, key.dptr, idl->b_ids[j] );
+ ldbm_datum_init( k2 );
+ sprintf( kstr, "%c%s%ld", CONT_PREFIX, key.dptr, idl->b_ids[j] );
k2.dptr = kstr;
k2.dsize = strlen( kstr ) + 1;