From: ian <ian>
Date: Fri, 25 Aug 2006 21:04:33 +0000 (+0000)
Subject: use dispatch()
X-Git-Tag: debian/1.1.1~39
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=chiark-tcl.git;a=commitdiff_plain;h=a409808cf18cad599afe7313095c66125e1469ec

use dispatch()
---

diff --git a/adns/adns.c b/adns/adns.c
index 7fe2728..14ea50c 100644
--- a/adns/adns.c
+++ b/adns/adns.c
@@ -807,10 +807,4 @@ const IdDataSpec cht_adnstcl_queries= {
 
 /*---------- main hooks for tcl ----------*/
 
-int cht_do_adnstoplevel_adns(ClientData cd, Tcl_Interp *ip,
-		      const Adns_SubCommand *subcmd,
-		      int objc, Tcl_Obj *const *objv) {
-  return subcmd->func(0,ip,objc,objv);
-}
-
 CHT_INIT(adns, {}, CHTI_COMMANDS(cht_adnstoplevel_entries))
diff --git a/adns/adns.tct b/adns/adns.tct
index a1c2756..7abfc9f 100644
--- a/adns/adns.tct
+++ b/adns/adns.tct
@@ -23,8 +23,7 @@ Fini adnsresults		free(@);
 
 Table *adnstoplevel TopLevel_Command
 	adns
-		subcmd	enum(Adns/_SubCommand, "adns subcommand")
-		...	obj
+		dispatch(Adns/_SubCommand, "adns subcommand")
 
 Table adns Adns_SubCommand
 	lookup
diff --git a/cdb/cdb.tct b/cdb/cdb.tct
index 9754324..d414f0d 100644
--- a/cdb/cdb.tct
+++ b/cdb/cdb.tct
@@ -19,11 +19,9 @@
 
 Table *cdbtoplevel TopLevel_Command
 	cdb
-		subcmd	enum(Cdb/_SubCommand, "cdb subcommand")
-		...	obj
+		dispatch(Cdb/_SubCommand, "cdb subcommand")
 	cdb-wr
-		subcmd	enum(Cdbwr/_SubCommand, "cdb-wr subcommand")
-		...	obj
+		dispatch(Cdbwr/_SubCommand, "cdb-wr subcommand")
 
 Table cdb Cdb_SubCommand
 	open
diff --git a/cdb/readonly.c b/cdb/readonly.c
index 7a3ba44..65ddc1d 100644
--- a/cdb/readonly.c
+++ b/cdb/readonly.c
@@ -95,9 +95,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);
-}
diff --git a/cdb/writeable.c b/cdb/writeable.c
index 9cdd009..6259ea0 100644
--- a/cdb/writeable.c
+++ b/cdb/writeable.c
@@ -935,9 +935,3 @@ int cht_do_cdbwr_lookup_hb(ClientData cd, Tcl_Interp *ip, void *rw_v,
   return cht_cdb_donesomelookup(ip, rw_v, def, result, data, dlen,
 				cht_cdb_storeanswer_hb);
 }
-
-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);
-}
diff --git a/crypto/crypto.tct b/crypto/crypto.tct
index 9be6afd..1f0a254 100644
--- a/crypto/crypto.tct
+++ b/crypto/crypto.tct
@@ -19,8 +19,7 @@
 
 Table *hbcryptotoplevel TopLevel_Command
 	hbcrypto
-		subcmd	enum(HBCrypto/_SubCommand, "hbcrypto subcommand")
-		...	obj
+		dispatch(HBCrypto/_SubCommand, "hbcrypto subcommand")
 
 Table hbcrypto HBCrypto_SubCommand
 	pad
diff --git a/crypto/hook.c b/crypto/hook.c
index 17aefc3..8b0a984 100644
--- a/crypto/hook.c
+++ b/crypto/hook.c
@@ -21,12 +21,6 @@
 
 #include "chiark_tcl_crypto.h"
 
-int cht_do_hbcryptotoplevel_hbcrypto(ClientData cd, Tcl_Interp *ip,
-		       const HBCrypto_SubCommand *subcmd,
-		       int objc, Tcl_Obj *const *objv) {
-  return subcmd->func(0,ip,objc,objv);
-}
-
 CHT_INIT(crypto,
 	 CHTI_OTHER(hbytes)  CHTI_TYPE(cht_blockcipherkey_type),
 	 CHTI_COMMANDS(cht_hbcryptotoplevel_entries))