[Bf-blender-cvs] [60ffc08] master: Cleanup: use BLI_hash_ prefix for md5 api

[Campbell Barton]

Commit: 60ffc08547476781f9b3f61c344af13fbad13ec5
Author: Campbell Barton
Date:   Fri Nov 14 11:53:27 2014 +0100
Branches: master
https://developer.blender.org/rB60ffc08547476781f9b3f61c344af13fbad13ec5

Cleanup: use BLI_hash_ prefix for md5 api

===================================================================

M	source/blender/blenlib/BLI_hash_md5.h
M	source/blender/blenlib/intern/hash_md5.c
M	source/blender/imbuf/intern/thumbs.c
M	source/blender/render/intern/source/render_result.c

===================================================================

diff --git a/source/blender/blenlib/BLI_hash_md5.h b/source/blender/blenlib/BLI_hash_md5.h
index 81a0eb9..544ae75 100644
--- a/source/blender/blenlib/BLI_hash_md5.h
+++ b/source/blender/blenlib/BLI_hash_md5.h
@@ -30,14 +30,14 @@
  * output yields to the wanted ASCII representation of the message
  * digest.  */
 
-void *md5_buffer(const char *buffer, size_t len, void *resblock);
+void *BLI_hash_md5_buffer(const char *buffer, size_t len, void *resblock);
 
 /* Compute MD5 message digest for bytes read from STREAM.  The
  * resulting message digest number will be written into the 16 bytes
  * beginning at RESBLOCK.  */
 
-int md5_stream(FILE *stream, void *resblock);
+int BLI_hash_md5_stream(FILE *stream, void *resblock);
 
-char *md5_to_hexdigest(void *resblock, char r_hex_digest[33]);
+char *BLI_hash_md5_to_hexdigest(void *resblock, char r_hex_digest[33]);
 
 #endif  /* __BLI_HASH_MD5_H__ */
diff --git a/source/blender/blenlib/intern/hash_md5.c b/source/blender/blenlib/intern/hash_md5.c
index 4301978..bc7a495 100644
--- a/source/blender/blenlib/intern/hash_md5.c
+++ b/source/blender/blenlib/intern/hash_md5.c
@@ -77,7 +77,8 @@
 #endif
 
 
-/* Following code is low level, upon which are built up the functions 'md5_stream' and 'md5_buffer'. */
+/* Following code is low level, upon which are built up the functions
+ * 'BLI_hash_md5_stream' and 'BLI_hash_md5_buffer'. */
 
 /* Structure to save state of computation between the single steps. */
 struct md5_ctx
@@ -284,7 +285,7 @@ static void *md5_read_ctx(const struct md5_ctx *ctx, void *resbuf)
  *  The resulting message digest number will be written into the 16 bytes beginning at 'resblock'.
  *  \return Non-zero if an error occurred.
  */
-int md5_stream(FILE *stream, void *resblock)
+int BLI_hash_md5_stream(FILE *stream, void *resblock)
 {
 #define BLOCKSIZE 4096  /* Important: must be a multiple of 64. */
 	struct md5_ctx ctx;
@@ -356,7 +357,7 @@ int md5_stream(FILE *stream, void *resblock)
  *  The result is always in little endian byte order, so that a byte-wise output yields to the wanted
  *  ASCII representation of the message digest.
  */
-void *md5_buffer(const char *buffer, size_t len, void *resblock)
+void *BLI_hash_md5_buffer(const char *buffer, size_t len, void *resblock)
 {
 	struct md5_ctx ctx;
 	char restbuf[64 + 72];
@@ -390,7 +391,7 @@ void *md5_buffer(const char *buffer, size_t len, void *resblock)
 	return md5_read_ctx(&ctx, resblock);
 }
 
-char *md5_to_hexdigest(void *resblock, char r_hex_digest[33])
+char *BLI_hash_md5_to_hexdigest(void *resblock, char r_hex_digest[33])
 {
 	static const char hex_map[17] = "0123456789abcdef";
 	const unsigned char *p;
diff --git a/source/blender/imbuf/intern/thumbs.c b/source/blender/imbuf/intern/thumbs.c
index 285f846..94e95c0 100644
--- a/source/blender/imbuf/intern/thumbs.c
+++ b/source/blender/imbuf/intern/thumbs.c
@@ -244,9 +244,9 @@ static void thumbname_from_uri(const char *uri, char *thumb, const int thumb_len
 	char hexdigest[33];
 	unsigned char digest[16];
 
-	md5_buffer(uri, strlen(uri), digest);
+	BLI_hash_md5_buffer(uri, strlen(uri), digest);
 	hexdigest[0] = '\0';
-	BLI_snprintf(thumb, thumb_len, "%s.png", md5_to_hexdigest(digest, hexdigest));
+	BLI_snprintf(thumb, thumb_len, "%s.png", BLI_hash_md5_to_hexdigest(digest, hexdigest));
 
 	// printf("%s: '%s' --> '%s'\n", __func__, uri, thumb);
 }
diff --git a/source/blender/render/intern/source/render_result.c b/source/blender/render/intern/source/render_result.c
index d7c56dd..08a82d0 100644
--- a/source/blender/render/intern/source/render_result.c
+++ b/source/blender/render/intern/source/render_result.c
@@ -1160,13 +1160,13 @@ static void render_result_exr_file_cache_path(Scene *sce, const char *root, char
 	if (G.main->name[0]) {
 		BLI_split_dirfile(G.main->name, dirname, filename, sizeof(dirname), sizeof(filename));
 		BLI_replace_extension(filename, sizeof(filename), "");  /* strip '.blend' */
-		md5_buffer(G.main->name, strlen(G.main->name), path_digest);
+		BLI_hash_md5_buffer(G.main->name, strlen(G.main->name), path_digest);
 	}
 	else {
 		BLI_strncpy(dirname, BLI_temp_dir_base(), sizeof(dirname));
 		BLI_strncpy(filename, "UNSAVED", sizeof(filename));
 	}
-	md5_to_hexdigest(path_digest, path_hexdigest);
+	BLI_hash_md5_to_hexdigest(path_digest, path_hexdigest);
 
 	/* Default to *non-volatile* tmp dir. */
 	if (*root == '\0') {