static const HashValue *ht_lookup(HashTable *ht, const char *key) {
Tcl_HashEntry *he;
- const HashValue *htv;
- he= Tcl_FindHashEntry(ht, key);
+ he= Tcl_FindHashEntry(&ht->t, key);
if (!he) return 0;
return Tcl_GetHashValue(he);
/*---------- Lookups ----------*/
-static int lookup(Tcl_Interp *ip, Rw *rw, const char *key, ) {
- const HashValue val;
+static int lookup_rw(Tcl_Interp *ip, void *rw_v, const char *key,
+ const Byte **data_r, int *len_r /* -1 => notfound */) {
+ Rw *rw= rw_v;
+ const HashValue *val;
+ int r;
val= ht_lookup(&rw->logincore, key);
- if (!val) {
- cdb_ &rw->cdb
+ if (val) {
+ if (val->len) { *data_r= val->data; *len_r= val->len; return TCL_OK; }
+ else { *data_r= 0; *len_r= -1; return TCL_OK; }
+ }
- return notfound;
-
+ r= cdb_find(&rw->cdb, key, strlen(key));
+ 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(&rw->cdb);
+ assert(*len_r > 0);
+ *data_r= cdb_getdata(&rw->cdb);
+ if (!*data_r) return cht_posixerr(ip, errno, "cdb_getdata failed");
+ return TCL_OK;
+}
-int cht_do_cdbwr_lookup(ClientData cd, Tcl_Interp *ip, void *db,
- const char *key, Tcl_Obj *def, Tcl_Obj **result) {
+int cht_do_cdbwr_lookup(ClientData cd, Tcl_Interp *ip, void *rw_v,
+ const char *key, Tcl_Obj *def,
+ Tcl_Obj **result) {
+ return cht_cdb_dosomelookup(ip, rw_v, key, def, result,
+ lookup_rw, cht_cdb_storeanswer_string);
+}
+int cht_do_cdbwr_lookup_hb(ClientData cd, Tcl_Interp *ip, void *rw_v,
+ const char *key, Tcl_Obj *def,
+ Tcl_Obj **result) {
+ return cht_cdb_dosomelookup(ip, rw_v, key, def, result,
+ lookup_rw, cht_cdb_storeanswer_hb);
}
-
-int cht_do_cdbwr_lookup_hb(ClientData cd, Tcl_Interp *ip, void *db, const char *key, HBytes_Value def, HBytes_Value *result);