new initialisation arrangements are sane and consistent

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

diff --git a/crypto/hook.c b/crypto/hook.c
index 002c0d4fa30e79bc319311acdab8a4d52074c047..17aefc38ab60d262b1ef2b6e2bae650e48171536 100644 (file)
--- a/crypto/hook.c
+++ b/crypto/hook.c
@@ -1,6 +1,24 @@
 /*
+ * crypto - Tcl bindings for parts of the `nettle' crypto library
+ * Copyright 2006 Ian Jackson
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
  */
 
+
 #include "chiark_tcl_crypto.h"
 
 int cht_do_hbcryptotoplevel_hbcrypto(ClientData cd, Tcl_Interp *ip,
@@ -9,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))