summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGert Wollny <[email protected]>2018-06-05 13:58:47 +0200
committerGert Wollny <[email protected]>2018-06-20 11:08:28 +0200
commitbf6b695a90d7f1ee6b1af93301ed91c4fdd8d9af (patch)
tree25575d80bb4f98d80dcbc8b231f687d1156af771
parentfc9e259e58ef73633bd51827427cc2ea63569ae0 (diff)
gallium/aux/tgsi/tgsi_parse.c: Fix two 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 >= Signed-off-by: Gert Wollny <[email protected]> Reviewed-by: Emil Velikov <[email protected]>
-rw-r--r--src/gallium/auxiliary/tgsi/tgsi_parse.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/gallium/auxiliary/tgsi/tgsi_parse.c b/src/gallium/auxiliary/tgsi/tgsi_parse.c
index c706fc8ae2e..65f7e74e116 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;
}