From dc2feaa95b492b9fccfa457d6f1d371affd104e6 Mon Sep 17 00:00:00 2001 Message-Id: From: Mark Wooding Date: Mon, 2 Aug 1999 16:53:48 +0000 Subject: [PATCH] Improve type safety for sym_iter objects. Organization: Straylight/Edgeware From: mdw --- sym.h | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/sym.h b/sym.h index edd3284..1de62f1 100644 --- a/sym.h +++ b/sym.h @@ -1,6 +1,6 @@ /* -*-c-*- * - * $Id: sym.h,v 1.8 1999/08/02 14:45:48 mdw Exp $ + * $Id: sym.h,v 1.9 1999/08/02 16:53:48 mdw Exp $ * * Symbol table management * @@ -30,6 +30,9 @@ /*----- Revision history --------------------------------------------------* * * $Log: sym.h,v $ + * Revision 1.9 1999/08/02 16:53:48 mdw + * Improve type safety for sym_iter objects. + * * Revision 1.8 1999/08/02 14:45:48 mdw * Break low-level hashtable code out from sym. * @@ -119,7 +122,7 @@ typedef struct sym_base { /* --- An iterator block --- */ -typedef hash_iter sym_iter; +typedef struct { hash_iter i; } sym_iter; /*----- External functions ------------------------------------------------*/ @@ -206,7 +209,7 @@ extern void sym_remove(sym_table */*t*/, void */*b*/); * iterate through a symbol table. */ -#define SYM_MKITER(i, t) HASH_MKITER((i), &(t)->t) +#define SYM_MKITER(i_, t_) HASH_MKITER(&(i_)->i, &(t_)->t) extern void sym_mkiter(sym_iter */*i*/, sym_table */*t*/); @@ -220,9 +223,9 @@ extern void sym_mkiter(sym_iter */*i*/, sym_table */*t*/); * returned in any particular order. */ -#define SYM_NEXT(i, p) do { \ +#define SYM_NEXT(i_, p) do { \ hash_base *_q; \ - HASH_NEXT((i), _q); \ + HASH_NEXT(&(i_)->i, _q); \ (p) = (void *)_q; \ } while (0) -- [mdw]