Mesa (master): util: Fix warning of invalid return value

Chad Versace chadversary at kemper.freedesktop.org
Fri Apr 15 20:58:53 UTC 2016


Module: Mesa
Branch: master
Commit: 4a80890177015fef792ac2e069452fe340f36769
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=4a80890177015fef792ac2e069452fe340f36769

Author: Chad Versace <chad.versace at intel.com>
Date:   Fri Apr 15 12:33:41 2016 -0700

util: Fix warning of invalid return value

_mesa_libgcrypt_init() returns NULL, but its return type is void.

Reviewed-by: Mark Janes <mark.a.janes at intel.com>

---

 src/util/mesa-sha1.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/util/mesa-sha1.c b/src/util/mesa-sha1.c
index ca6b89b..b6a192f 100644
--- a/src/util/mesa-sha1.c
+++ b/src/util/mesa-sha1.c
@@ -180,7 +180,8 @@ _mesa_sha1_final(struct mesa_sha1 *ctx, unsigned char result[20])
 static void _mesa_libgcrypt_init(void)
 {
    if (!gcry_check_version(NULL))
-      return NULL;
+      return;
+
    gcry_control(GCRYCTL_DISABLE_SECMEM, 0);
    gcry_control(GCRYCTL_INITIALIZATION_FINISHED, 0);
 }




More information about the mesa-commit mailing list