From: Joel Rosdahl <joel@rosdahl.net>
Date: Fri, 13 Aug 2010 20:55:09 +0000 (+0200)
Subject: Put functions in hash.c in a more natural order
X-Git-Tag: v3.1~86
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f86dbeaf3ce67733ca3f6e927a53e5afda34803b;p=thirdparty%2Fccache.git

Put functions in hash.c in a more natural order
---

diff --git a/ccache.h b/ccache.h
index 1fca1f6af..a317100f8 100644
--- a/ccache.h
+++ b/ccache.h
@@ -68,14 +68,14 @@ enum stats {
 /* hash.c */
 
 void hash_start(struct mdfour *md);
+void hash_buffer(struct mdfour *md, const void *s, size_t len);
+char *hash_result(struct mdfour *md);
+void hash_result_as_bytes(struct mdfour *md, unsigned char *out);
 void hash_delimiter(struct mdfour *md, const char* type);
 void hash_string(struct mdfour *md, const char *s);
 void hash_int(struct mdfour *md, int x);
 int hash_fd(struct mdfour *md, int fd);
 int hash_file(struct mdfour *md, const char *fname);
-char *hash_result(struct mdfour *md);
-void hash_result_as_bytes(struct mdfour *md, unsigned char *out);
-void hash_buffer(struct mdfour *md, const void *s, size_t len);
 
 /* ------------------------------------------------------------------------- */
 /* util.c */
diff --git a/hash.c b/hash.c
index 151fc2627..d6b95bcd4 100644
--- a/hash.c
+++ b/hash.c
@@ -28,16 +28,34 @@
 
 #define HASH_DELIMITER "\000cCaChE"
 
+void
+hash_start(struct mdfour *md)
+{
+	mdfour_begin(md);
+}
+
 void
 hash_buffer(struct mdfour *md, const void *s, size_t len)
 {
 	mdfour_update(md, (unsigned char *)s, len);
 }
 
+/* Return the hash result as a hex string. Caller frees. */
+char *
+hash_result(struct mdfour *md)
+{
+	unsigned char sum[16];
+
+	hash_result_as_bytes(md, sum);
+	return format_hash_as_string(sum, (unsigned) md->totalN);
+}
+
+/* return the hash result as 16 binary bytes */
 void
-hash_start(struct mdfour *md)
+hash_result_as_bytes(struct mdfour *md, unsigned char *out)
 {
-	mdfour_begin(md);
+	hash_buffer(md, NULL, 0);
+	mdfour_result(md, out);
 }
 
 /*
@@ -106,21 +124,3 @@ hash_file(struct mdfour *md, const char *fname)
 	close(fd);
 	return ret;
 }
-
-/* Return the hash result as a hex string. Caller frees. */
-char *
-hash_result(struct mdfour *md)
-{
-	unsigned char sum[16];
-
-	hash_result_as_bytes(md, sum);
-	return format_hash_as_string(sum, (unsigned) md->totalN);
-}
-
-/* return the hash result as 16 binary bytes */
-void
-hash_result_as_bytes(struct mdfour *md, unsigned char *out)
-{
-	hash_buffer(md, NULL, 0);
-	mdfour_result(md, out);
-}