use dispatch()

diff --git a/adns/adns.c b/adns/adns.c
index 7fe27285b944d06fb4086de731a16a6c7edc3df5..14ea50ce022b1b10a91fd7b251ef03ffd3b2e06f 100644 (file)
--- a/adns/adns.c
+++ b/adns/adns.c
@@ -807,10 +807,4 @@ const IdDataSpec cht_adnstcl_queries= {
 
 /*---------- main hooks for tcl ----------*/
 
 
 /*---------- 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))
 CHT_INIT(adns, {}, CHTI_COMMANDS(cht_adnstoplevel_entries))

diff --git a/adns/adns.tct b/adns/adns.tct
index a1c27565ec4cd3b884f419e010e860ea4a40465f..7abfc9f4697c78a3c5cc6f6bbebe44b127d67c06 100644 (file)
--- a/adns/adns.tct
+++ b/adns/adns.tct
@@ -23,8 +23,7 @@ Fini adnsresults              free(@);
 
 Table *adnstoplevel TopLevel_Command
        adns
 
 Table *adnstoplevel TopLevel_Command
        adns

-               subcmd  enum(Adns/_SubCommand, "adns subcommand")
-               ...     obj
+               dispatch(Adns/_SubCommand, "adns subcommand")

 
 Table adns Adns_SubCommand
        lookup
 
 Table adns Adns_SubCommand
        lookup

diff --git a/cdb/cdb.tct b/cdb/cdb.tct
index 9754324ee88439840591b096ad2f3e4085315562..d414f0d9939b8786d4507bb497539b887e247f23 100644 (file)
--- a/cdb/cdb.tct
+++ b/cdb/cdb.tct
@@ -19,11 +19,9 @@
 
 Table *cdbtoplevel TopLevel_Command
        cdb
 
 Table *cdbtoplevel TopLevel_Command
        cdb

-               subcmd  enum(Cdb/_SubCommand, "cdb subcommand")
-               ...     obj
+               dispatch(Cdb/_SubCommand, "cdb subcommand")

        cdb-wr
        cdb-wr

-               subcmd  enum(Cdbwr/_SubCommand, "cdb-wr subcommand")
-               ...     obj
+               dispatch(Cdbwr/_SubCommand, "cdb-wr subcommand")

 
 Table cdb Cdb_SubCommand
        open
 
 Table cdb Cdb_SubCommand
        open

diff --git a/cdb/readonly.c b/cdb/readonly.c
index 7a3ba446439b825fa8b51c05ba62b48d486b69ff..65ddc1d3014f5d046668902f58770b16b7973c5b 100644 (file)
--- 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);
 }
   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 9cdd0095bd615fd1a1359e2ee145a81e12487513..6259ea05ea9803a41b619896cc56771774bbbeeb 100644 (file)
--- 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);
 }
   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 9be6afd740d4c9e88a10f48e141c447115262344..1f0a25492dfc477a1077a0e3a1647cb6f456730f 100644 (file)
--- a/crypto/crypto.tct
+++ b/crypto/crypto.tct
@@ -19,8 +19,7 @@
 
 Table *hbcryptotoplevel TopLevel_Command
        hbcrypto
 
 Table *hbcryptotoplevel TopLevel_Command
        hbcrypto

-               subcmd  enum(HBCrypto/_SubCommand, "hbcrypto subcommand")
-               ...     obj
+               dispatch(HBCrypto/_SubCommand, "hbcrypto subcommand")

 
 Table hbcrypto HBCrypto_SubCommand
        pad
 
 Table hbcrypto HBCrypto_SubCommand
        pad

diff --git a/crypto/hook.c b/crypto/hook.c
index 17aefc38ab60d262b1ef2b6e2bae650e48171536..8b0a984b4dd8d597077429d36e30d9777c2e61fe 100644 (file)
--- a/crypto/hook.c
+++ b/crypto/hook.c
@@ -21,12 +21,6 @@
 
 #include "chiark_tcl_crypto.h"
 
 
 #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))
 CHT_INIT(crypto,
         CHTI_OTHER(hbytes)  CHTI_TYPE(cht_blockcipherkey_type),
         CHTI_COMMANDS(cht_hbcryptotoplevel_entries))