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

diff --git a/hashsum.c b/hashsum.c
index 11a5d37..a175397 100644
--- a/hashsum.c
+++ b/hashsum.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: hashsum.c,v 1.9 2004/04/04 19:42:59 mdw Exp $
+ * $Id: hashsum.c,v 1.10 2004/04/08 01:36:15 mdw Exp $
  *
  * Hash files using some secure hash function
  *
@@ -27,41 +27,6 @@
  * MA 02111-1307, USA.
  */
 
-/*----- Revision history --------------------------------------------------* 
- *
- * $Log: hashsum.c,v $
- * Revision 1.9  2004/04/04 19:42:59  mdw
- * Add set -e.
- *
- * Revision 1.8  2001/04/19 18:26:33  mdw
- * Add CRC as another hash function.
- *
- * Revision 1.7  2001/02/21 20:03:22  mdw
- * Added support for MD2 hash function.
- *
- * Revision 1.6  2001/01/25 21:40:14  mdw
- * Support for new SHA variants added.
- *
- * Revision 1.5  2000/12/06 20:33:27  mdw
- * Make flags be macros rather than enumerations, to ensure that they're
- * unsigned.
- *
- * Revision 1.4  2000/08/04 23:23:44  mdw
- * Various <ctype.h> fixes.
- *
- * Revision 1.3  2000/07/29 17:02:43  mdw
- * (checkhash): Be pettier about spaces between the hash and filename, for
- * compatiblity with `md5sum'.
- *
- * Revision 1.2  2000/07/15 21:14:05  mdw
- * Missed `-e' out of the usage string.
- *
- * Revision 1.1  2000/07/15 20:52:34  mdw
- * Useful replacement for `md5sum' with support for many different hash
- * functions and for reading filename lists from `find'.
- *
- */
-
 /*----- Header files ------------------------------------------------------*/
 
 #include "config.h"
@@ -120,11 +85,11 @@ static int fhash(const char *file, unsigned f, const gchash *gch, void *buf)
   else if ((fp = fopen(file, f & f_binary ? "rb" : "r")) == 0)
     return (-1);
 
-  h = gch->init();
+  h = GH_INIT(gch);
   while ((sz = fread(fbuf, 1, sizeof(fbuf), fp)) > 0)
-    h->ops->hash(h, fbuf, sz);
-  h->ops->done(h, buf);
-  h->ops->destroy(h);
+    GH_HASH(h, fbuf, sz);
+  GH_DONE(h, buf);
+  GH_DESTROY(h);
   e = ferror(fp);
   if (file)
     fclose(fp);