From 13d65b9785d1557e29f5f06871d01bad8e76e44c Mon Sep 17 00:00:00 2001
From: Thomas White <taw@physics.org>
Date: Wed, 21 Jul 2021 15:22:12 +0200
Subject: Clean up shadowed variables

---
 src/diffraction-gpu.c | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'src/diffraction-gpu.c')

diff --git a/src/diffraction-gpu.c b/src/diffraction-gpu.c
index 7829d9da..97badc36 100644
--- a/src/diffraction-gpu.c
+++ b/src/diffraction-gpu.c
@@ -391,7 +391,7 @@ struct gpu_context *setup_gpu(int no_sfac,
 	size_t flags_size;
 	float *flags_ptr;
 	size_t maxwgsize;
-	int i;
+	int iplat;
 	int have_ctx = 0;
 	char cflags[512] = "";
 	char *insert_stuff = NULL;
@@ -409,10 +409,10 @@ struct gpu_context *setup_gpu(int no_sfac,
 	}
 
 	/* Find a GPU platform in the list */
-	for ( i=0; i<nplat; i++ ) {
+	for ( iplat=0; iplat<nplat; iplat++ ) {
 
 		prop[0] = CL_CONTEXT_PLATFORM;
-		prop[1] = (cl_context_properties)platforms[i];
+		prop[1] = (cl_context_properties)platforms[iplat];
 		prop[2] = 0;
 
 		gctx = malloc(sizeof(*gctx));
@@ -430,7 +430,8 @@ struct gpu_context *setup_gpu(int no_sfac,
 				return NULL;
 			}
 		} else {
-			STATUS("Using OpenCL platform %i (%i total)\n", i, nplat);
+			STATUS("Using OpenCL platform %i (%i total)\n",
+			       iplat, nplat);
 			have_ctx = 1;
 			break;
 		}
@@ -454,10 +455,12 @@ struct gpu_context *setup_gpu(int no_sfac,
 	intensities_size = IDIM*IDIM*IDIM*sizeof(cl_float);
 	intensities_ptr = malloc(intensities_size);
 	if ( intensities != NULL ) {
+		int i;
 		for ( i=0; i<IDIM*IDIM*IDIM; i++ ) {
 			intensities_ptr[i] = intensities[i];
 		}
 	} else {
+		int i;
 		for ( i=0; i<IDIM*IDIM*IDIM; i++ ) {
 			intensities_ptr[i] = 100.0;  /* Does nothing */
 		}
@@ -522,10 +525,12 @@ struct gpu_context *setup_gpu(int no_sfac,
 	flags_size = IDIM*IDIM*IDIM*sizeof(cl_float);
 	flags_ptr = malloc(flags_size);
 	if ( flags != NULL ) {
+		int i;
 		for ( i=0; i<IDIM*IDIM*IDIM; i++ ) {
 			flags_ptr[i] = flags[i];
 		}
 	} else {
+		int i;
 		for ( i=0; i<IDIM*IDIM*IDIM; i++ ) {
 			flags_ptr[i] = 1.0;
 		}
-- 
cgit v1.2.3