Implemented all of the (db_)destroy and (db_)close functions

This commit is contained in:
Ben Collins 1999-02-17 01:55:03 +00:00
parent 78a5ebe216
commit 8c3f485d8b
2 changed files with 40 additions and 9 deletions

View file

@ -1,5 +1,5 @@
/*
* $Id$
* $Id: external.h,v 1.3 1999/02/16 23:26:05 bcollins Exp $
*/
#ifndef _TCL_EXTERNAL_H
@ -14,6 +14,7 @@ extern int tcl_back_destroy LDAP_P(( BackendInfo *bi ));
extern int tcl_back_db_init LDAP_P(( BackendDB *bd ));
extern int tcl_back_db_open LDAP_P(( BackendDB *bd ));
extern int tcl_back_db_close LDAP_P(( BackendDB *bd ));
extern int tcl_back_db_destroy LDAP_P(( BackendDB *bd ));
extern int tcl_back_db_config LDAP_P(( BackendDB *bd,

View file

@ -7,6 +7,10 @@
* as authorized by the OpenLDAP Public License. A copy of this
* license is available at http://www.OpenLDAP.org/license.html or
* in file LICENSE in the top-level directory of the distribution.
*
* $Id$
*
* $Log$
*/
#include "portable.h"
@ -21,7 +25,11 @@ tcl_back_close (
BackendInfo * bi
)
{
return 0;
Tcl_DeleteInterp(global_i->interp);
Tcl_Free(global_i->interp);
free(global_i);
return( 0 );
}
int
@ -29,9 +37,30 @@ tcl_back_destroy(
BackendInfo *bi
)
{
ldap_pvt_thread_mutex_destroy( &tcl_interpreter_mutex );
ldap_pvt_thread_mutex_destroy( &tcl_interpreter_mutex );
return 0;
return( 0 );
}
int
tcl_back_db_close(
BackendDB *bd
)
{
struct tclinfo *ti = (struct tclinfo *) bd->be_private;
struct i_info *ti_tmp;
/* Disable the interp and associated struct */
ti->ti_ii->count--;
if (!ti->ti_ii->count && strcasecmp("default", ti->ti_ii->name)) {
/* no more db's using this and it's not the default */
for(ti_tmp = global_i; ti_tmp->next != ti->ti_ii; ti_tmp = ti_tmp->next)
;
/* This bypasses this interp struct in the global hash */
ti_tmp->next = ti->ti_ii->next;
Tcl_DeleteInterp(ti->ti_ii->interp);
}
return( 0 );
}
int
@ -40,17 +69,18 @@ tcl_back_db_destroy(
)
{
struct tclinfo *ti = (struct tclinfo *) bd->be_private;
struct i_info *ti_tmp;
/*
* Now free up the allocated memory used
*/
ti->ti_ii->count--;
if (!ti->ti_ii->count && strcasecmp("default", ti->ti_ii->name)) {
/* no more db's using this and it's not the default */
for(ti_tmp = global_i; ti_tmp->next != ti->ti_ii; ti_tmp = ti_tmp->next)
;
ti_tmp->next = ti->ti_ii->next;
Tcl_Free(ti->ti_ii->interp);
free(ti->ti_ii);
free(ti);
}
free( bd->be_private );
bd->be_private = NULL;
return( 0 );
}