new initialisation arrangements are sane and consistent

[chiark-tcl.git] / crypto / hook.c

diff --git a/crypto/hook.c b/crypto/hook.c
index f8c567fe4dfc65da87412cee6fc31a95c3e73f5b..17aefc38ab60d262b1ef2b6e2bae650e48171536 100644 (file)
--- a/crypto/hook.c
+++ b/crypto/hook.c
@@ -27,16 +27,6 @@ int cht_do_hbcryptotoplevel_hbcrypto(ClientData cd, Tcl_Interp *ip,
   return subcmd->func(0,ip,objc,objv);
 }
 
-extern int Chiark_tcl_crypto_Init(Tcl_Interp *ip); /*called by load(3tcl)*/
-int Chiark_tcl_crypto_Init(Tcl_Interp *ip) {
-  static int initd;
-  int rc;
-
-  rc= Chiark_tcl_hbytes_Init(ip);  if (rc) return rc;
-  rc= cht_initextension(ip, cht_hbcryptotoplevel_entries, &initd,
-                       &cht_blockcipherkey_type,
-                       (Tcl_ObjType*)0);
-  if (rc) return rc;
-
-  return TCL_OK;
-}
+CHT_INIT(crypto,
+        CHTI_OTHER(hbytes)  CHTI_TYPE(cht_blockcipherkey_type),
+        CHTI_COMMANDS(cht_hbcryptotoplevel_entries))