/* -*-c-*-
*
- * $Id: ghash-def.h,v 1.1 1999/12/10 23:21:37 mdw Exp $
+ * $Id: ghash-def.h,v 1.2 2000/06/17 11:22:03 mdw Exp $
*
* Definitions for generic hash interface
*
/*----- Revision history --------------------------------------------------*
*
* $Log: ghash-def.h,v $
+ * Revision 1.2 2000/06/17 11:22:03 mdw
+ * Use secure arena for memory allocation. Minor changes in the generic
+ * hash interface.
+ *
* Revision 1.1 1999/12/10 23:21:37 mdw
* Generic interface.
*
#include <mLib/bits.h>
#include <mLib/sub.h>
+#ifndef CATACOMB_ARENA_H
+# include "arena.h"
+#endif
+
#ifndef CATACOMB_GHASH_H
# include "ghash.h"
#endif
\
static ghash *ghinit(void) \
{ \
- gctx *g = CREATE(gctx); \
+ gctx *g = S_CREATE(gctx); \
g->h.ops = &gops; \
pre##_init(&g->c); \
return (&g->h); \
static void ghdestroy(ghash *h) \
{ \
gctx *g = (gctx *)h; \
- DESTROY(g); \
+ S_DESTROY(g); \
} \
\
-static const ghash_ops gops = { &pre.b, ghhash, ghdone, ghdestroy }; \
-const gchash pre = { { #pre, PRE##_HASHSZ }, ghinit };
+static const ghash_ops gops = { &pre, ghhash, ghdone, ghdestroy }; \
+const gchash pre = { #pre, PRE##_HASHSZ, ghinit };
/*----- That's all, folks -------------------------------------------------*/