[Mesa-dev] [PATCH 3/5] util/sha1: drop _mesa_sha1_{update, format} return type

Emil Velikov emil.l.velikov at gmail.com
Tue Jan 24 21:21:10 UTC 2017


From: Emil Velikov <emil.velikov at collabora.com>

Unused/unchecked by any of the callers.

Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
---
 src/util/mesa-sha1.c | 7 ++-----
 src/util/mesa-sha1.h | 4 ++--
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/util/mesa-sha1.c b/src/util/mesa-sha1.c
index eb882e8bd0..a14fec97e7 100644
--- a/src/util/mesa-sha1.c
+++ b/src/util/mesa-sha1.c
@@ -27,11 +27,10 @@
 #include "sha1/sha1.h"
 #include "mesa-sha1.h"
 
-int
+void
 _mesa_sha1_update(struct mesa_sha1 *ctx, const void *data, int size)
 {
    SHA1Update(ctx, data, size);
-   return 1;
 }
 
 void
@@ -44,7 +43,7 @@ _mesa_sha1_compute(const void *data, size_t size, unsigned char result[20])
    _mesa_sha1_final(&ctx, result);
 }
 
-char *
+void
 _mesa_sha1_format(char *buf, const unsigned char *sha1)
 {
    static const char hex_digits[] = "0123456789abcdef";
@@ -55,6 +54,4 @@ _mesa_sha1_format(char *buf, const unsigned char *sha1)
       buf[i + 1] = hex_digits[sha1[i >> 1] & 0x0f];
    }
    buf[i] = '\0';
-
-   return buf;
 }
diff --git a/src/util/mesa-sha1.h b/src/util/mesa-sha1.h
index f927d5772d..ecbc708b5e 100644
--- a/src/util/mesa-sha1.h
+++ b/src/util/mesa-sha1.h
@@ -34,7 +34,7 @@ extern "C" {
 
 #define _mesa_sha1_init SHA1Init
 
-int
+void
 _mesa_sha1_update(struct mesa_sha1 *ctx, const void *data, int size);
 
 static inline void
@@ -43,7 +43,7 @@ _mesa_sha1_final(struct mesa_sha1 *ctx, unsigned char result[20])
    SHA1Final(result, ctx);
 }
 
-char *
+void
 _mesa_sha1_format(char *buf, const unsigned char *sha1);
 
 void
-- 
2.11.0



More information about the mesa-dev mailing list