X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/898a4e2555438ff8adb08b4d82690d08715e1048..b817bfc642225b8c3c0b6a7e42d1fb949b61a606:/grand.h

diff --git a/grand.h b/grand.h
index 160663e..0446b2b 100644
--- a/grand.h
+++ b/grand.h
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: grand.h,v 1.4 2001/04/19 18:23:53 mdw Exp $
+ * $Id: grand.h,v 1.5 2004/04/08 01:36:15 mdw Exp $
  *
  * Generic interface to random number generators
  *
@@ -27,24 +27,6 @@
  * MA 02111-1307, USA.
  */
 
-/*----- Revision history --------------------------------------------------* 
- *
- * $Log: grand.h,v $
- * Revision 1.4  2001/04/19 18:23:53  mdw
- * Use unsigned integer rather than enum for flags.
- *
- * Revision 1.3  2001/02/03 16:07:33  mdw
- * Give generic random objects separate namespaces for their supported misc
- * ops.
- *
- * Revision 1.2  2000/06/17 11:23:11  mdw
- * Typesetting fix.  Add a flags word to the generic generator.
- *
- * Revision 1.1  1999/12/10 23:16:01  mdw
- * Generic interface.
- *
- */
-
 #ifndef CATACOMB_GRAND_H
 #define CATACOMB_GRAND_H
 
@@ -92,6 +74,12 @@ typedef struct grand_ops {
   void (*fill)(grand */*r*/, void */*p*/, size_t /*sz*/); /* Fill buffer */
 } grand_ops;
 
+#define GR_DESTROY(r)		(r)->ops->destroy((r))
+#define GR_RAW(r)		(r)->ops->raw((r))
+#define GR_WORD(r)		(r)->ops->word((r))
+#define GR_RANGE(r, l)		(r)->ops->range((r), (l))
+#define GR_FILL(r, p, sz)	(r)->ops->fill((r), (p), (sz))
+
 /* --- Flag types --- */
 
 #define GRAND_CRYPTO 1u			/* Cryptographically strong */