#include "chiark_tcl_cdb.h"
-static void destroy_cdb_idtabcb(Tcl_Interp *ip, void *val) { abort(); }
-
-const IdDataSpec cdbtcl_databases= {
- "cdb-db", "cdb-opendatabases-table", destroy_cdb_idtabcb
-};
-
typedef struct Ro {
int ix, fd;
struct cdb cdb;
} Ro;
+static void ro_close(Ro *ro) {
+ cdb_free(&ro->cdb);
+ close(ro->fd);
+}
+
+static void destroy_cdb_idtabcb(Tcl_Interp *ip, void *ro_v) {
+ ro_close(ro_v);
+ TFREE(ro_v);
+}
+
+const IdDataSpec cdbtcl_databases= {
+ "cdb-db", "cdb-opendatabases-table", destroy_cdb_idtabcb
+};
+
int cht_do_cdb_open(ClientData cd, Tcl_Interp *ip,
const char *path, void **result) {
Ro *ro;
int rc, r;
ro= TALLOC(sizeof(*ro));
+ ro->ix= -1;
ro->fd= open(path, O_RDONLY);
if (ro->fd<0) PE("open database file");
r= cdb_init(&ro->cdb, ro->fd);
}
int cht_do_cdb_close(ClientData cd, Tcl_Interp *ip, void *ro_v) {
- Ro *ro= ro_v;
- cdb_free(&ro->cdb);
- close(ro->fd);
- TFREE(ro);
+ ro_close(ro_v);
+ cht_tabledataid_disposing(ip, ro_v, &cdbtcl_databases);
+ TFREE(ro_v);
return TCL_OK;
}