From e3ac13e16a4a1311e8e73f242e878d74c2063341 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Fri, 16 Oct 2015 11:01:42 +0100 Subject: tests/gem_pwrite_snooped: Fix use of GCC pragmas Apparently GCC treats the #pragma directive as a code block and so we returned unconditionally from memchr_inv() on the first byte fubaring the test. commit b04691b3e8e62bd105f0f4d8d3b9e7da187f0c90 Author: Thomas Wood Date: Tue Sep 8 11:16:46 2015 +0100 tests/gem_pwrite_snooped: disable const cast warning Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=92227 Signed-off-by: Chris Wilson --- tests/gem_pwrite_snooped.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/gem_pwrite_snooped.c b/tests/gem_pwrite_snooped.c index 5783e3b2..b1933956 100644 --- a/tests/gem_pwrite_snooped.c +++ b/tests/gem_pwrite_snooped.c @@ -78,17 +78,17 @@ static void blit(drm_intel_bo *dst, drm_intel_bo *src, static void *memchr_inv(const void *s, int c, size_t n) { - const unsigned char *us = s; - unsigned char uc = c; + const uint8_t *us = s; + const uint8_t uc = c; - while (n--) { - if (*us != uc) #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wcast-qual" + while (n--) { + if (*us != uc) return (void *) us; -#pragma GCC diagnostic pop us++; } +#pragma GCC diagnostic pop return NULL; } -- cgit v1.2.3