copyright dates

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

diff --git a/cdb/readonly.c b/cdb/readonly.c
index d9f3eefcf2a3b65ee6e738f9d8586b8ea9b9080d..0ebaa404ee09b25afde8e5851ee1798a77a5eb7e 100644 (file)
--- a/cdb/readonly.c
+++ b/cdb/readonly.c
@@ -1,24 +1,51 @@
-/**/
+/*
+ * 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, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
 
 #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 +59,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;
 }