From: Imre Deak Subject: [PATCH 1/8] fix warn: 'div' shadows a global declaration Date: Wed, 10 Oct 2012 16:04:38 +0300 Message-ID: <1349874285-31536-2-git-send-email-imre.deak@intel.com> References: <1349874285-31536-1-git-send-email-imre.deak@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mga14.intel.com (mga14.intel.com [143.182.124.37]) by gabe.freedesktop.org (Postfix) with ESMTP id D1CD89E8FD for ; Wed, 10 Oct 2012 06:04:49 -0700 (PDT) In-Reply-To: <1349874285-31536-1-git-send-email-imre.deak@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org To: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org Signed-off-by: Imre Deak --- lib/drmtest.c | 6 +++--- tests/gem_storedw_batches_loop.c | 6 +++--- tests/gem_storedw_loop_blt.c | 6 +++--- tests/gem_storedw_loop_bsd.c | 6 +++--- tests/gem_storedw_loop_render.c | 6 +++--- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/lib/drmtest.c b/lib/drmtest.c index 35fd346..c309851 100644 --- a/lib/drmtest.c +++ b/lib/drmtest.c @@ -541,7 +541,7 @@ void drmtest_permute_array(void *array, unsigned size, void drmtest_progress(const char *header, uint64_t i, uint64_t total) { - int div = 200; + int divider = 200; if (i+1 >= total) { fprintf(stderr, "\r%s100%%\n", header); @@ -549,10 +549,10 @@ void drmtest_progress(const char *header, uint64_t i, uint64_t total) } if (total / 200 == 0) - div = 1; + divider = 1; /* only bother updating about every 0.5% */ - if (i % (total / div) == 0 || i+1 >= total) { + if (i % (total / divider) == 0 || i+1 >= total) { fprintf(stderr, "\r%s%3llu%%", header, (long long unsigned) i * 100 / total); } diff --git a/tests/gem_storedw_batches_loop.c b/tests/gem_storedw_batches_loop.c index 576e564..48490be 100644 --- a/tests/gem_storedw_batches_loop.c +++ b/tests/gem_storedw_batches_loop.c @@ -48,13 +48,13 @@ static int has_ppgtt = 0; /* Like the store dword test, but we create new command buffers each time */ static void -store_dword_loop(int div) +store_dword_loop(int divider) { int cmd, i, val = 0, ret; uint32_t *buf; drm_intel_bo *cmd_bo; - printf("running storedw loop with stall every %i batch\n", div); + printf("running storedw loop with stall every %i batch\n", divider); cmd = MI_STORE_DWORD_IMM; if (!has_ppgtt) @@ -106,7 +106,7 @@ store_dword_loop(int div) exit(-1); } - if (i % div != 0) + if (i % divider != 0) goto cont; drm_intel_bo_wait_rendering(cmd_bo); diff --git a/tests/gem_storedw_loop_blt.c b/tests/gem_storedw_loop_blt.c index 037f0ef..edf5057 100644 --- a/tests/gem_storedw_loop_blt.c +++ b/tests/gem_storedw_loop_blt.c @@ -52,12 +52,12 @@ static int has_ppgtt = 0; */ static void -store_dword_loop(int div) +store_dword_loop(int divider) { int cmd, i, val = 0; uint32_t *buf; - printf("running storedw loop on blt with stall every %i batch\n", div); + printf("running storedw loop on blt with stall every %i batch\n", divider); cmd = MI_STORE_DWORD_IMM; if (!has_ppgtt) @@ -74,7 +74,7 @@ store_dword_loop(int div) intel_batchbuffer_flush_on_ring(batch, I915_EXEC_BLT); - if (i % div != 0) + if (i % divider != 0) goto cont; drm_intel_bo_map(target_buffer, 0); diff --git a/tests/gem_storedw_loop_bsd.c b/tests/gem_storedw_loop_bsd.c index 17a460e..8d40d35 100644 --- a/tests/gem_storedw_loop_bsd.c +++ b/tests/gem_storedw_loop_bsd.c @@ -52,12 +52,12 @@ static int has_ppgtt = 0; */ static void -store_dword_loop(int div) +store_dword_loop(int divider) { int cmd, i, val = 0; uint32_t *buf; - printf("running storedw loop on bsd with stall every %i batch\n", div); + printf("running storedw loop on bsd with stall every %i batch\n", divider); cmd = MI_STORE_DWORD_IMM; if (!has_ppgtt) @@ -74,7 +74,7 @@ store_dword_loop(int div) intel_batchbuffer_flush_on_ring(batch, I915_EXEC_BSD); - if (i % div != 0) + if (i % divider != 0) goto cont; drm_intel_bo_map(target_buffer, 0); diff --git a/tests/gem_storedw_loop_render.c b/tests/gem_storedw_loop_render.c index 33a6a39..2309432 100644 --- a/tests/gem_storedw_loop_render.c +++ b/tests/gem_storedw_loop_render.c @@ -52,12 +52,12 @@ static int has_ppgtt = 0; */ static void -store_dword_loop(int div) +store_dword_loop(int divider) { int cmd, i, val = 0; uint32_t *buf; - printf("running storedw loop on render with stall every %i batch\n", div); + printf("running storedw loop on render with stall every %i batch\n", divider); cmd = MI_STORE_DWORD_IMM; if (!has_ppgtt) @@ -74,7 +74,7 @@ store_dword_loop(int div) intel_batchbuffer_flush_on_ring(batch, 0); - if (i % div != 0) + if (i % divider != 0) goto cont; drm_intel_bo_map(target_buffer, 0); -- 1.7.9.5