if (fd>=0) close(fd);
}
-#define PE(m) do{ \
- rc= cht_posixerr(ip, errno, "failed to " m); goto x_rc; \
- }while(0)
-
/*==================== Subsystems and subtypes ====================*/
/*---------- Pathbuf ----------*/
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);
}
mainfd= open(pathbuf_sfx(&rw->pbsome,".main"), O_RDONLY);
- if (mainfd<0) PE("open exist3ing database file .main");
+ if (mainfd<0) PE("open existing database file .main");
rc= acquire_lock(ip, &rw->pbsome, &rw->lock_fd); if (rc) goto x_rc;
r= fstat(mainfd, &stab); if (r) PE("fstat .main");
/*---------- 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;
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;
-
+ return cht_cdb_lookup_cdb(ip, &rw->cdb, key, strlen(key), data_r, len_r);
+}
-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) {
+ const Byte *data;
+ int dlen, r;
+ r= lookup_rw(ip, rw_v, key, &data, &dlen); if (r) return r;
+ return cht_cdb_donesomelookup(ip, rw_v, def, result, data, dlen,
+ 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) {
+ const Byte *data;
+ int dlen, r;
+
+ r= lookup_rw(ip, rw_v, key, &data, &dlen); if (r) return r;
+ return cht_cdb_donesomelookup(ip, rw_v, def, result, data, dlen,
+ 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);
+int cht_do_cdbtoplevel_cdb_wr(ClientData cd, Tcl_Interp *ip,
+ const Cdbwr_SubCommand* subcmd,
+ int objc, Tcl_Obj *const *objv) {
+ return subcmd->func((void*)subcmd,ip,objc,objv);
+}