Hash utilities: maintain a hash state object, not a bundle of arguments.

[u/mdw/catacomb] / ghash.h

diff --git a/ghash.h b/ghash.h
index 4b8e6a3..d20aff4 100644 (file)
--- a/ghash.h
+++ b/ghash.h
@@ -7,7 +7,7 @@
  * (c) 1999 Straylight/Edgeware
  */
 
-/*----- Licensing notice --------------------------------------------------* 
+/*----- Licensing notice --------------------------------------------------*
  *
  * This file is part of Catacomb.
  *
@@ -15,12 +15,12 @@
  * it under the terms of the GNU Library General Public License as
  * published by the Free Software Foundation; either version 2 of the
  * License, or (at your option) any later version.
- * 
+ *
  * Catacomb 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 Library General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Library General Public
  * License along with Catacomb; if not, write to the Free
  * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
@@ -101,7 +101,7 @@ typedef struct ghash_ops {
 #  define GH_HASHBUF64_B(h, p, sz) GH_HASHBUF_((h), (p), (sz), 64_B)
 #endif
 
-#define GH_HASHSTR_(h, p, W) do {                                      \
+#define GH_HASHSTR_(h, p, W) do {                                      \
   const char *p_ = (p); GH_HASHBUF_((h), p_, strlen(p_), W);           \
 } while (0)
 #define GH_HASHSTR8(h, p) GH_HASHSTR_((h), (p), 8)
@@ -115,9 +115,9 @@ typedef struct ghash_ops {
 #define GH_HASHSTR32_L(h, p) GH_HASHSTR_((h), (p), 32_L)
 #define GH_HASHSTR32_B(h, p) GH_HASHSTR_((h), (p), 32_B)
 #ifdef HAVE_UINT64
-#  define GH_HASHSTR32(h, p) GH_HASHSTR_((h), (p), 64)
-#  define GH_HASHSTR32_L(h, p) GH_HASHSTR_((h), (p), 64_L)
-#  define GH_HASHSTR32_B(h, p) GH_HASHSTR_((h), (p), 64_B)
+#  define GH_HASHSTR64(h, p) GH_HASHSTR_((h), (p), 64)
+#  define GH_HASHSTR64_L(h, p) GH_HASHSTR_((h), (p), 64_L)
+#  define GH_HASHSTR64_B(h, p) GH_HASHSTR_((h), (p), 64_B)
 #endif
 
 #define GH_HASHSTRZ(h, p) do {                                         \