util/sha1: harmonize _mesa_sha1_* wrappers

Rather than using 3 different ways to wrap _mesa_sha1_*() to SHA1*()
functions (a macro, prototype with implementation in .c and an inline
function), make all 3 inline functions.

Signed-off-by: Grazvydas Ignotas <notasas@gmail.com>
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>

diff --git a/src/util/mesa-sha1.c b/src/util/mesa-sha1.c
index a14fec97e7c0a520faec6fed4340e23408d3b8cd..fa9284627b19e11e185c65b4b5b843bc80b9927d 100644 (file)
--- a/src/util/mesa-sha1.c
+++ b/src/util/mesa-sha1.c
@@ -27,12 +27,6 @@
 #include "sha1/sha1.h"
 #include "mesa-sha1.h"
 
-void
-_mesa_sha1_update(struct mesa_sha1 *ctx, const void *data, int size)
-{
-   SHA1Update(ctx, data, size);
-}
-
 void
 _mesa_sha1_compute(const void *data, size_t size, unsigned char result[20])
 {

diff --git a/src/util/mesa-sha1.h b/src/util/mesa-sha1.h
index ecbc708b5ea5c81266eb4e9ae2e266f334b988da..a81aba96e94695b2ce8e131582195a794c552d54 100644 (file)
--- a/src/util/mesa-sha1.h
+++ b/src/util/mesa-sha1.h
@@ -32,10 +32,17 @@ extern "C" {
 
 #define mesa_sha1 _SHA1_CTX
 
-#define _mesa_sha1_init SHA1Init
+static inline void
+_mesa_sha1_init(struct mesa_sha1 *ctx)
+{
+   SHA1Init(ctx);
+}
 
-void
-_mesa_sha1_update(struct mesa_sha1 *ctx, const void *data, int size);
+static inline void
+_mesa_sha1_update(struct mesa_sha1 *ctx, const void *data, size_t size)
+{
+   SHA1Update(ctx, (const unsigned char *)data, size);
+}
 
 static inline void
 _mesa_sha1_final(struct mesa_sha1 *ctx, unsigned char result[20])