From d30031ae87fd081b7e2160be7164ee159ba88b68 Mon Sep 17 00:00:00 2001 From: Gert Wollny Date: Wed, 30 May 2018 14:56:45 +0200 Subject: [PATCH] gallium/aux/tgsi/tgsi_parse.c: Fix warnings tgsi_parse.c: In function 'tgsi_parse_free': tgsi_parse.c:54:31: warning: unused parameter 'ctx' [-Wunused-parameter] struct tgsi_parse_context *ctx ) ^~~ tgsi_parse.c: In function 'tgsi_parse_end_of_tokens': tgsi_parse.c:62:25: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] return ctx->Position >= v2: Replace VREND_UNUSED by UNUSED (Erik) Reviewed-by: Erik Faye-Lund Signed-off-by: Gert Wollny Signed-off-by: Jakob Bornecrantz --- src/gallium/auxiliary/tgsi/tgsi_parse.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/gallium/auxiliary/tgsi/tgsi_parse.c b/src/gallium/auxiliary/tgsi/tgsi_parse.c index ce9a0cd..58f31b3 100644 --- a/src/gallium/auxiliary/tgsi/tgsi_parse.c +++ b/src/gallium/auxiliary/tgsi/tgsi_parse.c @@ -51,7 +51,7 @@ tgsi_parse_init( void tgsi_parse_free( - struct tgsi_parse_context *ctx ) + UNUSED struct tgsi_parse_context *ctx ) { } @@ -59,8 +59,12 @@ boolean tgsi_parse_end_of_tokens( struct tgsi_parse_context *ctx ) { - return ctx->Position >= - ctx->FullHeader.Header.HeaderSize + ctx->FullHeader.Header.BodySize; + /* All values involved are unsigned, but the sum will be promoted to + * a signed value (at least on 64 bit). To capture a possible overflow + * make it a signed comparison. + */ + return (int)ctx->Position >= + ctx->FullHeader.Header.HeaderSize + ctx->FullHeader.Header.BodySize; }