test-load targets: Use strip to sanitise whitespace in OTHER_DIRS so that the subst...

[chiark-tcl.git] / cdb / readonly.c

diff --git a/cdb/readonly.c b/cdb/readonly.c
index a084fc8d2d5ef62c01c62f40b148ecae9b140dfd..53823b8a57ca0e112c72be77aedb0083ab7bbeb0 100644 (file)
--- a/cdb/readonly.c
+++ b/cdb/readonly.c
@@ -1,24 +1,49 @@
-/**/
+/*
+ * cdb, cdb-wr - Tcl bindings for tinycdb and a journalling write extension
+ * Copyright 2006-2012 Ian Jackson
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this library; if not, see <http://www.gnu.org/licenses/>.
+ */
 
 #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);
@@ -32,10 +57,9 @@ int cht_do_cdb_open(ClientData cd, Tcl_Interp *ip,
 }
 
 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;
 }
 
@@ -69,9 +93,3 @@ int cht_do_cdb_lookup_hb(ClientData cd, Tcl_Interp *ip, void *ro_v,
   return cht_cdb_donesomelookup(ip, ro_v, def, result, data, dlen,
                                cht_cdb_storeanswer_hb);
 }
-
-int cht_do_cdbtoplevel_cdb(ClientData cd, Tcl_Interp *ip,
-                          const Cdb_SubCommand* subcmd,
-                          int objc, Tcl_Obj *const *objv) {
-  return subcmd->func((void*)subcmd,ip,objc,objv);
-}