.log -> .jrn

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

diff --git a/cdb/lookup.c b/cdb/lookup.c
index 52598efdc1ccc68cb41801be921f2942563439fa..5c32d865b07e15dcadb7c9d391b9d4393cddf321 100644 (file)
--- a/cdb/lookup.c
+++ b/cdb/lookup.c
@@ -2,20 +2,12 @@
 
 #include "chiark_tcl_cdb.h"
 
-int cht_cdb_dosomelookup(Tcl_Interp *ip, void *db_v,
-                        const char *key, Tcl_Obj *def,
-                        Tcl_Obj **result,
-                        int (*somelookup)(Tcl_Interp *ip, void *db_v,
-                                          const char *key,
-                                          const Byte **data_r, int *len_r),
-                        int (*storeanswer)(Tcl_Interp *ip, Tcl_Obj **result,
-                                           const Byte *data, int len)) {
-  int r, len;
-  const Byte *data;
-  
-  r= somelookup(ip, db_v, key, &data, &len);
-  if (r) return r;
-  if (len>0) return storeanswer(ip, result, data, len);
+int cht_cdb_donesomelookup(Tcl_Interp *ip, void *db_v,
+                          Tcl_Obj *def, Tcl_Obj **result,
+                          const Byte *data, int dlen,
+                          int (*storeanswer)(Tcl_Interp *ip, Tcl_Obj **result,
+                                             const Byte *data, int len)) {
+  if (dlen>0) return storeanswer(ip, result, data, dlen);
   if (def) { *result= def; return TCL_OK; }
   return cht_staticerr(ip, "cdbwr lookup key not found", "CDB NOTFOUND");
 }
@@ -35,3 +27,25 @@ int cht_cdb_storeanswer_hb(Tcl_Interp *ip, Tcl_Obj **result,
   *result= cht_ret_hb(ip, val);
   return TCL_OK;
 }
+
+int cht_cdb_lookup_cdb(Tcl_Interp *ip, struct cdb *cdb,
+                      const Byte *key, int klen,
+                      const Byte **data_r, int *len_r) {
+  int r;
+  
+  r= cdb_find(cdb, key, klen);
+  if (!r) { *data_r= 0; *len_r= -1; return TCL_OK; }
+  if (r<0) return cht_posixerr(ip, errno, "cdb_find failed");
+  assert(r==1);
+  *len_r= cdb_datalen(cdb);
+  assert(*len_r > 0);
+  *data_r= cdb_getdata(cdb);
+  if (!*data_r) return cht_posixerr(ip, errno, "cdb_getdata failed");
+  return TCL_OK;
+}
+
+
+extern int Chiark_tcl_cdb_Init(Tcl_Interp *ip); /* called by Tcl's "load" */
+int Chiark_tcl_cdb_Init(Tcl_Interp *ip) {
+  return cht_initextension(ip, cht_cdbtoplevel_entries, 0);
+}