From 10d3702a3647842e66433d8b51557cba8b01e7e1 Mon Sep 17 00:00:00 2001 From: Grazvydas Ignotas Date: Wed, 22 Mar 2017 01:43:34 +0200 Subject: [PATCH] util/sha1: harmonize _mesa_sha1_* wrappers MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Nicolai Hähnle Reviewed-by: Emil Velikov --- src/util/mesa-sha1.c | 6 ------ src/util/mesa-sha1.h | 13 ++++++++++--- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/util/mesa-sha1.c b/src/util/mesa-sha1.c index a14fec97e7c..fa9284627b1 100644 --- 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 ecbc708b5ea..a81aba96e94 100644 --- 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]) -- 2.30.2