All of lore.kernel.org
 help / color / mirror / Atom feed
From: Imre Deak <imre.deak@intel.com>
To: intel-gfx@lists.freedesktop.org
Subject: [PATCH 1/8] fix warn: 'div' shadows a global declaration
Date: Wed, 10 Oct 2012 16:04:38 +0300	[thread overview]
Message-ID: <1349874285-31536-2-git-send-email-imre.deak@intel.com> (raw)
In-Reply-To: <1349874285-31536-1-git-send-email-imre.deak@intel.com>

Signed-off-by: Imre Deak <imre.deak@intel.com>
---
 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

  reply	other threads:[~2012-10-10 13:04 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-10-10 13:04 [PATCH 0/8] i-g-t: fix compile warnings Imre Deak
2012-10-10 13:04 ` Imre Deak [this message]
2012-10-10 13:04 ` [PATCH 2/8] fix warn in intel_error_decode: ignoring return value of 'asprintf' Imre Deak
2012-10-10 13:04 ` [PATCH 3/8] fix warn in intel_reg_snapshot: ignoring return value of 'write' Imre Deak
2012-10-10 13:04 ` [PATCH 4/8] fix warn in gem_readwrite: 'read/write' shadows a global declaration Imre Deak
2012-10-10 13:04 ` [PATCH 5/8] fix warn in sysfs_{rc6, rps}*: ignoring return value of 'fscanf' Imre Deak
2012-10-10 13:04 ` [PATCH 6/8] fix warn in gem_reg_read: 'read' shadows a global declaration Imre Deak
2012-10-10 13:04 ` [PATCH 7/8] fix warn in prime_nv_*: ignoring return value of ‘fgets’ Imre Deak
2012-10-10 13:04 ` [PATCH 8/8] fix warn in testdisplay: ignoring return value of 'chdir' Imre Deak

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1349874285-31536-2-git-send-email-imre.deak@intel.com \
    --to=imre.deak@intel.com \
    --cc=intel-gfx@lists.freedesktop.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.