From: ian <ian>
Date: Thu, 25 Nov 2004 00:21:18 +0000 (+0000)
Subject: mask-map is hbytes subcommand
X-Git-Tag: debian/1.1.1~125
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=chiark-tcl.git;a=commitdiff_plain;h=b7effca02db339dd29fb17c8e40e39edd90e8fa4

mask-map is hbytes subcommand
---

diff --git a/base/hook.c b/base/hook.c
index 8ef140f..2d59baa 100644
--- a/base/hook.c
+++ b/base/hook.c
@@ -324,6 +324,12 @@ int do_hbytes_range(ClientData cd, Tcl_Interp *ip,
   return TCL_OK;
 }
 
+int do_hbytes_mask_map(ClientData cd, Tcl_Interp *ip,
+		      const MaskMap_SubCommand *subcmd,
+		      int objc, Tcl_Obj *const *objv) {
+  return subcmd->func(0,ip,objc,objv);
+}
+
 /* hbytes representing uint16_t's */
 
 int do_hbytes_h2ushort(ClientData cd, Tcl_Interp *ip,
@@ -380,12 +386,6 @@ int do_toplevel_ulong(ClientData cd, Tcl_Interp *ip,
   return subcmd->func(0,ip,objc,objv);
 }
 
-int do_toplevel_mask_map(ClientData cd, Tcl_Interp *ip,
-		      const MaskMap_SubCommand *subcmd,
-		      int objc, Tcl_Obj *const *objv) {
-  return subcmd->func(0,ip,objc,objv);
-}
-
 #define URANDOM "/dev/urandom"
 
 int get_urandom(Tcl_Interp *ip, Byte *buffer, int l) {
diff --git a/base/tables-examples.tct b/base/tables-examples.tct
index 235f770..8396130 100644
--- a/base/tables-examples.tct
+++ b/base/tables-examples.tct
@@ -34,9 +34,6 @@ Table toplevel TopLevel_Command
 	ulong
 		subcmd	enum(ULong_SubCommand,"ulong subcommand")
 		...	obj
-	mask-map
-		subcmd	enum(MaskMap_SubCommand, "hbytes mask-map subcommand")
-		...	obj
 
 Table maskmap MaskMap_SubCommand
 	lookup
@@ -182,6 +179,9 @@ Table hbytes HBytes_SubCommand
 		prop	enum(HashAlgPropInfo, "prop")
 		alg	enum(HashAlgInfo, "alg")
 		=>	int
+	mask-map
+		subcmd	enum(MaskMap_SubCommand, "hbytes mask-map subcommand")
+		...	obj
 
 Table padmethodinfo PadMethodInfo
 	pkcs5
diff --git a/hbytes/hook.c b/hbytes/hook.c
index 8ef140f..2d59baa 100644
--- a/hbytes/hook.c
+++ b/hbytes/hook.c
@@ -324,6 +324,12 @@ int do_hbytes_range(ClientData cd, Tcl_Interp *ip,
   return TCL_OK;
 }
 
+int do_hbytes_mask_map(ClientData cd, Tcl_Interp *ip,
+		      const MaskMap_SubCommand *subcmd,
+		      int objc, Tcl_Obj *const *objv) {
+  return subcmd->func(0,ip,objc,objv);
+}
+
 /* hbytes representing uint16_t's */
 
 int do_hbytes_h2ushort(ClientData cd, Tcl_Interp *ip,
@@ -380,12 +386,6 @@ int do_toplevel_ulong(ClientData cd, Tcl_Interp *ip,
   return subcmd->func(0,ip,objc,objv);
 }
 
-int do_toplevel_mask_map(ClientData cd, Tcl_Interp *ip,
-		      const MaskMap_SubCommand *subcmd,
-		      int objc, Tcl_Obj *const *objv) {
-  return subcmd->func(0,ip,objc,objv);
-}
-
 #define URANDOM "/dev/urandom"
 
 int get_urandom(Tcl_Interp *ip, Byte *buffer, int l) {