Clean up shadowed variables

11 files changed, 123 insertions, 111 deletions

diff --git a/src/ambigator.c b/src/ambigator.c
index 02252cd7..a7ec0eae 100644
--- a/src/ambigator.c
+++ b/src/ambigator.c
@@ -1056,7 +1056,7 @@ int main(int argc, char *argv[])
 	int n_dif;
 	struct flist **crystals;
 	Stream *st;
-	int i;
+	int j;
 	int *assignments;
 	int *orig_assignments;
 	gsl_rng *rng;
@@ -1362,6 +1362,7 @@ int main(int argc, char *argv[])
 	if ( start_ass_fn != NULL ) {
 
 		FILE *fh;
+		int i;
 		fh = fopen(start_ass_fn, "r");
 		if ( fh == NULL ) {
 			ERROR("Failed to open '%s'\n", start_ass_fn);
@@ -1387,13 +1388,14 @@ int main(int argc, char *argv[])
 		free(start_ass_fn);
 
 	} else {
+		int i;
 		for ( i=0; i<n_crystals; i++ ) {
 			assignments[i] = (random_flat(rng, 1.0) > 0.5);
 		}
 	}
 
-	for ( i=0; i<n_crystals; i++ ) {
-		orig_assignments[i] = assignments[i];
+	for ( j=0; j<n_crystals; j++ ) {
+		orig_assignments[j] = assignments[j];
 	}
 
 	if ( fg_graph_fn != NULL ) {
@@ -1415,16 +1417,16 @@ int main(int argc, char *argv[])
 	}
 	STATUS("Mean number of correlations per crystal: %.1f\n", mean_nac);
 
-	for ( i=0; i<n_crystals; i++ ) {
-		free(crystals[i]->s);
-		free(crystals[i]->i);
-		free(crystals[i]->s_reidx);
-		free(crystals[i]->i_reidx);
-		free(crystals[i]);
+	for ( j=0; j<n_crystals; j++ ) {
+		free(crystals[j]->s);
+		free(crystals[j]->i);
+		free(crystals[j]->s_reidx);
+		free(crystals[j]->i_reidx);
+		free(crystals[j]);
 	}
 	free(crystals);
 
-	for ( i=0; i<n_iter; i++ ) {
+	for ( j=0; j<n_iter; j++ ) {
 		detwin(ccs, n_crystals, assignments, fgfh, crystals);
 	}
 
@@ -1442,6 +1444,7 @@ int main(int argc, char *argv[])
 		if ( fh == NULL ) {
 			ERROR("Failed to open '%s'\n", end_ass_fn);
 		} else {
+			int i;
 			for ( i=0; i<n_crystals; i++ ) {
 				fprintf(fh, "%i\n", assignments[i]);
 			}
@@ -1450,8 +1453,8 @@ int main(int argc, char *argv[])
 	}
 
 	n_dif = 0;
-	for ( i=0; i<n_crystals; i++ ) {
-		if ( orig_assignments[i] != assignments[i] ) n_dif++;
+	for ( j=0; j<n_crystals; j++ ) {
+		if ( orig_assignments[j] != assignments[j] ) n_dif++;
 	}
 	STATUS("%i assignments are different from their starting values.\n",
 	       n_dif);
diff --git a/src/cell_tool.c b/src/cell_tool.c
index 8ed674f9..dbd3544c 100644
--- a/src/cell_tool.c
+++ b/src/cell_tool.c
@@ -191,7 +191,7 @@ static int all_rings(UnitCell *cell, SymOpList *sym, double mres)
 	RefList *list;
 	int i, n;
 	RefListIterator *iter;
-	Reflection *refl;
+	Reflection *ring;
 	struct sortmerefl *sortus;
 
 	cell_get_cartesian(cell, &ax, &ay, &az, &bx, &by, &bz, &cx, &cy, &cz);
@@ -235,19 +235,19 @@ static int all_rings(UnitCell *cell, SymOpList *sym, double mres)
 	sortus = malloc(n*sizeof(struct sortmerefl));
 
 	i = 0;
-	for ( refl = first_refl(list, &iter);
-	      refl != NULL;
-	      refl = next_refl(refl, iter) )
+	for ( ring = first_refl(list, &iter);
+	      ring != NULL;
+	      ring = next_refl(ring, iter) )
 	{
-		signed int h, k, l;
+		signed int rh, rk, rl;
 
-		get_indices(refl, &h, &k, &l);
+		get_indices(ring, &rh, &rk, &rl);
 
-		sortus[i].h = h;
-		sortus[i].k = k;
-		sortus[i].l = l;
-		sortus[i].resolution = 2.0*resolution(cell, h, k, l);  /* one over d */
-		sortus[i].multi = get_redundancy(refl);
+		sortus[i].h = rh;
+		sortus[i].k = rk;
+		sortus[i].l = rl;
+		sortus[i].resolution = 2.0*resolution(cell, rh, rk, rl);  /* one over d */
+		sortus[i].multi = get_redundancy(ring);
 		i++;
 
 	}
diff --git a/src/crystfel_gui.c b/src/crystfel_gui.c
index 159d1bc2..dbf949cd 100644
--- a/src/crystfel_gui.c
+++ b/src/crystfel_gui.c
@@ -1081,7 +1081,7 @@ int main(int argc, char *argv[])
 
 	if ( load_result == 0 ) {
 		DataTemplate *dtempl;
-		GtkAction *w;
+		GtkAction *act;
 		proj.cur_frame = 0;
 
 		if ( proj.geom_filename != NULL ) {
@@ -1103,20 +1103,20 @@ int main(int argc, char *argv[])
 			stream_close(st);
 		}
 
-		w = gtk_ui_manager_get_action(proj.ui, "/mainwindow/view/centre");
-		gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(w),
+		act = gtk_ui_manager_get_action(proj.ui, "/mainwindow/view/centre");
+		gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(act),
 		                             proj.show_centre);
 
-		w = gtk_ui_manager_get_action(proj.ui, "/mainwindow/view/peaks");
-		gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(w),
+		act = gtk_ui_manager_get_action(proj.ui, "/mainwindow/view/peaks");
+		gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(act),
 		                             proj.show_peaks);
 
-		w = gtk_ui_manager_get_action(proj.ui, "/mainwindow/view/refls");
-		gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(w),
+		act = gtk_ui_manager_get_action(proj.ui, "/mainwindow/view/refls");
+		gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(act),
 		                             proj.show_refls);
 
-		w = gtk_ui_manager_get_action(proj.ui, "/mainwindow/view/labelrefls");
-		gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(w),
+		act = gtk_ui_manager_get_action(proj.ui, "/mainwindow/view/labelrefls");
+		gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(act),
 		                             proj.label_refls);
 
 		update_imageview(&proj);
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;
 		}
diff --git a/src/gui_backend_slurm.c b/src/gui_backend_slurm.c
index 801921ea..aeabad3d 100644
--- a/src/gui_backend_slurm.c
+++ b/src/gui_backend_slurm.c
@@ -166,15 +166,15 @@ static double indexing_progress(struct slurm_job *job, int *running)
 
 	} else {
 
-		int i;
+		int ijob;
 		int n_proc = 0;
 
-		for ( i=0; i<job->n_blocks; i++ ) {
+		for ( ijob=0; ijob<job->n_blocks; ijob++ ) {
 
 			char tmp[128];
 			char *stderr_filename;
 
-			snprintf(tmp, 127, "stderr-%i.log", i);
+			snprintf(tmp, 127, "stderr-%i.log", ijob);
 			stderr_filename = relative_to_cwd(job->workdir, tmp);
 
 			n_proc += read_number_processed(stderr_filename);
diff --git a/src/gui_project.c b/src/gui_project.c
index 7141fcb8..952bbbe6 100644
--- a/src/gui_project.c
+++ b/src/gui_project.c
@@ -891,7 +891,7 @@ int load_project(struct crystfelproject *proj)
 
 int save_project(struct crystfelproject *proj)
 {
-	int i;
+	int ibackend, iresult, iframe;
 	FILE *fh;
 
 	fh = fopen("crystfel.project", "w");
@@ -986,9 +986,9 @@ int save_project(struct crystfelproject *proj)
 
 	fprintf(fh, "indexing.backend %s\n",
 	        proj->backends[proj->indexing_backend_selected].name);
-	for ( i=0; i<proj->n_backends; i++ ) {
+	for ( ibackend=0; ibackend<proj->n_backends; ibackend++ ) {
 		struct crystfel_backend *be;
-		be = &proj->backends[i];
+		be = &proj->backends[ibackend];
 		be->write_indexing_opts(be->indexing_opts_priv, fh);
 	}
 
@@ -1064,9 +1064,9 @@ int save_project(struct crystfelproject *proj)
 	}
 	fprintf(fh, "ambi.backend %s\n",
 	        proj->backends[proj->ambi_backend_selected].name);
-	for ( i=0; i<proj->n_backends; i++ ) {
+	for ( ibackend=0; ibackend<proj->n_backends; ibackend++ ) {
 		struct crystfel_backend *be;
-		be = &proj->backends[i];
+		be = &proj->backends[ibackend];
 		be->write_ambi_opts(be->ambi_opts_priv, fh);
 	}
 	if ( proj->ambi_new_job_title != NULL ) {
@@ -1109,9 +1109,9 @@ int save_project(struct crystfelproject *proj)
 
 	fprintf(fh, "merging.backend %s\n",
 	        proj->backends[proj->merging_backend_selected].name);
-	for ( i=0; i<proj->n_backends; i++ ) {
+	for ( ibackend=0; ibackend<proj->n_backends; ibackend++ ) {
 		struct crystfel_backend *be;
-		be = &proj->backends[i];
+		be = &proj->backends[ibackend];
 		be->write_merging_opts(be->merging_opts_priv, fh);
 	}
 	if ( proj->merging_new_job_title != NULL ) {
@@ -1134,33 +1134,33 @@ int save_project(struct crystfelproject *proj)
 	fprintf(fh, "label_refls %i\n", proj->label_refls);
 
 	fprintf(fh, "-----\n");
-	for ( i=0; i<proj->n_results; i++ ) {
+	for ( iresult=0; iresult<proj->n_results; iresult++ ) {
 		int j;
-		fprintf(fh, "Result %s\n", proj->results[i].name);
-		for ( j=0; j<proj->results[i].n_streams; j++ ) {
+		fprintf(fh, "Result %s\n", proj->results[iresult].name);
+		for ( j=0; j<proj->results[iresult].n_streams; j++ ) {
 			fprintf(fh, "   Stream %s\n",
-			        proj->results[i].streams[j]);
+			        proj->results[iresult].streams[j]);
 		}
 		if ( strcmp(selected_result(proj),
-		            proj->results[i].name) == 0 )
+		            proj->results[iresult].name) == 0 )
 		{
 			fprintf(fh, "   Selected\n");
 		}
 	}
-	for ( i=0; i<proj->n_merge_results; i++ ) {
-		fprintf(fh, "Result %s\n", proj->merge_results[i].name);
-		fprintf(fh, "   HKL %s\n", proj->merge_results[i].hkl);
-		fprintf(fh, "   HKL1 %s\n", proj->merge_results[i].hkl1);
-		fprintf(fh, "   HKL2 %s\n", proj->merge_results[i].hkl2);
+	for ( iresult=0; iresult<proj->n_merge_results; iresult++ ) {
+		fprintf(fh, "Result %s\n", proj->merge_results[iresult].name);
+		fprintf(fh, "   HKL %s\n", proj->merge_results[iresult].hkl);
+		fprintf(fh, "   HKL1 %s\n", proj->merge_results[iresult].hkl1);
+		fprintf(fh, "   HKL2 %s\n", proj->merge_results[iresult].hkl2);
 	}
 
 	fprintf(fh, "-----\n");
-	for ( i=0; i<proj->n_frames; i++ ) {
-		if ( proj->events[i] != NULL ) {
+	for ( iframe=0; iframe<proj->n_frames; iframe++ ) {
+		if ( proj->events[iframe] != NULL ) {
 			fprintf(fh, "%s %s\n",
-			        proj->filenames[i], proj->events[i]);
+			        proj->filenames[iframe], proj->events[iframe]);
 		} else {
-			fprintf(fh, "%s\n", proj->filenames[i]);
+			fprintf(fh, "%s\n", proj->filenames[iframe]);
 		}
 	}
 
diff --git a/src/partialator.c b/src/partialator.c
index 249eda93..ca0249ce 100644
--- a/src/partialator.c
+++ b/src/partialator.c
@@ -1014,7 +1014,7 @@ int main(int argc, char *argv[])
 	SymOpList *amb;
 	SymOpList *w_sym;
 	int nthreads = 1;
-	int i;
+	int istream, icmd, icryst, itn;
 	int n_iter = 10;
 	RefList *full;
 	int n_images = 0;
@@ -1104,8 +1104,8 @@ int main(int argc, char *argv[])
 	};
 
 	cmdline[0] = '\0';
-	for ( i=1; i<argc; i++ ) {
-		strncat(cmdline, argv[i], 1023-strlen(cmdline));
+	for ( icmd=1; icmd<argc; icmd++ ) {
+		strncat(cmdline, argv[icmd], 1023-strlen(cmdline));
 		strncat(cmdline, " ", 1023-strlen(cmdline));
 	}
 
@@ -1471,11 +1471,11 @@ int main(int argc, char *argv[])
 	}
 
 	audit_info = NULL;
-	for ( i=0; i<stream_list.n; i++ ) {
+	for ( istream=0; istream<stream_list.n; istream++ ) {
 
-		Stream *st = stream_open_for_read(stream_list.filenames[i]);
+		Stream *st = stream_open_for_read(stream_list.filenames[istream]);
 		if ( st == NULL ) {
-			ERROR("Couldn't open %s\n", stream_list.filenames[i]);
+			ERROR("Couldn't open %s\n", stream_list.filenames[istream]);
 			return 1;
 		}
 
@@ -1605,9 +1605,9 @@ int main(int argc, char *argv[])
 	if ( sparams_fh != NULL ) fclose(sparams_fh);
 
 	STATUS("Initial partiality calculation...\n");
-	for ( i=0; i<n_crystals; i++ ) {
+	for ( icryst=0; icryst<n_crystals; icryst++ ) {
 
-		Crystal *cr = crystals[i];
+		Crystal *cr = crystals[icryst];
 		update_predictions(cr);
 
 		/* Polarisation correction requires kpred values */
@@ -1647,13 +1647,13 @@ int main(int argc, char *argv[])
 	}
 
 	/* Iterate */
-	for ( i=0; i<n_iter; i++ ) {
+	for ( itn=0; itn<n_iter; itn++ ) {
 
-		STATUS("Scaling and refinement cycle %i of %i\n", i+1, n_iter);
+		STATUS("Scaling and refinement cycle %i of %i\n", itn+1, n_iter);
 
 		if ( !no_pr ) {
 			refine_all(crystals, n_crystals, full, nthreads, pmodel,
-			           i+1, no_logs, sym, amb, scaleflags);
+			           itn+1, no_logs, sym, amb, scaleflags);
 		}
 
 		/* Create new reference if needed */
@@ -1674,13 +1674,13 @@ int main(int argc, char *argv[])
 		show_all_residuals(crystals, n_crystals, full, no_free);
 
 		if ( do_write_logs ) {
-			write_pgraph(full, crystals, n_crystals, i+1, "");
+			write_pgraph(full, crystals, n_crystals, itn+1, "");
 		}
 
 		if ( output_everycycle ) {
 
 			char tmp[1024];
-			snprintf(tmp, 1024, "iter%.2d_%s", i+1, outfile);
+			snprintf(tmp, 1024, "iter%.2d_%s", itn+1, outfile);
 
 			/* Output results */
 			STATUS("Writing overall results to %s\n", tmp);
@@ -1745,6 +1745,7 @@ int main(int argc, char *argv[])
 
 	/* Output custom split results */
 	if ( csplit != NULL ) {
+		int i;
 		for ( i=0; i<csplit->n_datasets; i++ ) {
 			write_custom_split(csplit, i, crystals, n_crystals,
 			                   pmodel, min_measurements, push_res,
@@ -1754,15 +1755,15 @@ int main(int argc, char *argv[])
 
 	/* Clean up */
 	gsl_rng_free(rng);
-	for ( i=0; i<n_crystals; i++ ) {
-		struct image *image = crystal_get_image(crystals[i]);
+	for ( icryst=0; icryst<n_crystals; icryst++ ) {
+		struct image *image = crystal_get_image(crystals[icryst]);
 		spectrum_free(image->spectrum);
-		reflist_free(crystal_get_reflections(crystals[i]));
+		reflist_free(crystal_get_reflections(crystals[icryst]));
 		free(image->filename);
 		free(image->ev);
 		free(image);
-		cell_free(crystal_get_cell(crystals[i]));
-		crystal_free(crystals[i]);
+		cell_free(crystal_get_cell(crystals[icryst]));
+		crystal_free(crystals[icryst]);
 	}
 	free_contribs(full);
 	reflist_free(full);
diff --git a/src/pattern_sim.c b/src/pattern_sim.c
index 7098869d..b6414aa1 100644
--- a/src/pattern_sim.c
+++ b/src/pattern_sim.c
@@ -481,7 +481,7 @@ int main(int argc, char *argv[])
 	int config_gpu = 0;
 	int config_random = 0;
 	char *powder_fn = NULL;
-	char *filename = NULL;
+	char *cell_filename = NULL;
 	char *grad_str = NULL;
 	char *outfile = NULL;
 	char *geometry = NULL;
@@ -599,7 +599,7 @@ int main(int argc, char *argv[])
 			break;
 
 			case 'p' :
-			filename = strdup(optarg);
+			cell_filename = strdup(optarg);
 			break;
 
 			case 'o' :
@@ -761,8 +761,8 @@ int main(int argc, char *argv[])
 		return 1;
 	}
 
-	if ( filename == NULL ) {
-		filename = strdup("molecule.pdb");
+	if ( cell_filename == NULL ) {
+		cell_filename = strdup("molecule.pdb");
 	}
 
 	if ( outfile == NULL ) {
@@ -844,7 +844,7 @@ int main(int argc, char *argv[])
 	free(spectrum_str);
 
 	/* Load unit cell */
-	input_cell = load_cell_from_file(filename);
+	input_cell = load_cell_from_file(cell_filename);
 	if ( input_cell == NULL ) {
 		exit(1);
 	}
@@ -988,7 +988,7 @@ int main(int argc, char *argv[])
 	do {
 
 		int na, nb, nc;
-		double a, b, c, d;
+		double a, b, c, dis;
 		UnitCell *cell;
 		int err = 0;
 		int pi;
@@ -1094,7 +1094,7 @@ int main(int argc, char *argv[])
 
 		}
 
-		cell_get_parameters(cell, &a, &b, &c, &d, &d, &d);
+		cell_get_parameters(cell, &a, &b, &c, &dis, &dis, &dis);
 		STATUS("Particle size = %i x %i x %i"
 		       " ( = %5.2f x %5.2f x %5.2f nm)\n",
 	               na, nb, nc, na*a/1.0e-9, nb*b/1.0e-9, nc*c/1.0e-9);
@@ -1148,22 +1148,22 @@ int main(int argc, char *argv[])
 
 		if ( !config_noimages ) {
 
-			char filename[1024];
+			char h5filename[1024];
 
 			if ( n_images != 1 ) {
-				snprintf(filename, 1023, "%s-%i.h5",
+				snprintf(h5filename, 1023, "%s-%i.h5",
 				         outfile, number);
 			} else {
-				strncpy(filename, outfile, 1023);
+				strncpy(h5filename, outfile, 1023);
 			}
 
 			number++;
 
 			/* Write the output file */
-			image_write(image, dtempl, filename);
+			image_write(image, dtempl, h5filename);
 
 			/* Add some pattern_sim-specific metadata */
-			add_metadata(filename, orientation, cell);
+			add_metadata(h5filename, orientation, cell);
 
 		}
 
@@ -1190,7 +1190,7 @@ skip:
 	cell_free(input_cell);
 	free(intensities);
 	free(outfile);
-	free(filename);
+	free(cell_filename);
 	free(sym_str);
 	free_symoplist(sym);
 
diff --git a/src/process_hkl.c b/src/process_hkl.c
index b16146e3..be1c95d4 100644
--- a/src/process_hkl.c
+++ b/src/process_hkl.c
@@ -604,7 +604,7 @@ int main(int argc, char *argv[])
 	                                    .disable = 0};
 	char *rval;
 	int min_measurements = 2;
-	int r;
+	int merge_r;
 	int start_after = 0;
 	int stop_after = 0;
 	double min_snr = -INFINITY;
@@ -876,13 +876,13 @@ int main(int argc, char *argv[])
 	if ( config_scale ) twopass = 1;
 
 	hist_i = 0;
-	r = merge_all(&stream_list, model, NULL, sym,
-	              &hist_vals, hist_h, hist_k, hist_l,
-	              &hist_i, polarisation, min_measurements, min_snr,
-	              max_adu, start_after, stop_after, min_res, push_res,
-	              min_cc, config_scale, flag_even_odd, stat_output);
+	merge_r = merge_all(&stream_list, model, NULL, sym,
+	                    &hist_vals, hist_h, hist_k, hist_l,
+	                    &hist_i, polarisation, min_measurements, min_snr,
+	                    max_adu, start_after, stop_after, min_res, push_res,
+	                    min_cc, config_scale, flag_even_odd, stat_output);
 	fprintf(stderr, "\n");
-	if ( r ) {
+	if ( merge_r ) {
 		ERROR("Error while reading stream.\n");
 		return 1;
 	}
diff --git a/src/render_hkl.c b/src/render_hkl.c
index c47a2c4d..00992d71 100644
--- a/src/render_hkl.c
+++ b/src/render_hkl.c
@@ -758,7 +758,6 @@ int main(int argc, char *argv[])
 	int config_colkey = 0;
 	int config_zawhinge = 0;
 	char *cellfile = NULL;
-	int r = 0;
 	double boost = 1.0;
 	char *sym_str = NULL;
 	char *sym_str_fromfile = NULL;
@@ -1049,5 +1048,5 @@ int main(int argc, char *argv[])
 	reflist_free(list);
 	if ( outfile != NULL ) free(outfile);
 
-	return r;
+	return 0;
 }
diff --git a/src/whirligig.c b/src/whirligig.c
index 611825ba..20fcfa40 100644
--- a/src/whirligig.c
+++ b/src/whirligig.c
@@ -485,12 +485,14 @@ static void add_to_window(struct image *cur, struct window *win,
 
 	if ( pos >= win->ws ) {
 
-		int sf, i;
+		int sf, iwin;
 
 		sf = (pos - win->ws) + 1;
 
 		if ( series_fills_window(win) ) {
 
+			int i;
+
 			win->ws += sf;
 			win->img = realloc(win->img,
 			                   win->ws*sizeof(struct image));
@@ -513,6 +515,8 @@ static void add_to_window(struct image *cur, struct window *win,
 
 		} else {
 
+			int iser;
+
 			pos -= sf;
 			if ( sf > win->join_ptr ) {
 
@@ -534,29 +538,29 @@ static void add_to_window(struct image *cur, struct window *win,
 				sf = win->ws;
 			}
 
-			for ( i=0; i<sf; i++ ) {
-				if ( win->img[i].serial != 0 ) {
-					free_all_crystals(&win->img[i]);
+			for ( iser=0; iser<sf; iser++ ) {
+				if ( win->img[iser].serial != 0 ) {
+					free_all_crystals(&win->img[iser]);
 				}
 			}
 
 			memmove(win->img, win->img+sf,
 			        (win->ws-sf)*sizeof(struct image));
 
-			for ( i=0; i<MAX_SER; i++ ) {
-				memmove(win->ser[i], win->ser[i]+sf,
+			for ( iser=0; iser<MAX_SER; iser++ ) {
+				memmove(win->ser[iser], win->ser[iser]+sf,
 					(win->ws-sf)*sizeof(signed int));
-				memmove(win->mat[i], win->mat[i]+sf,
+				memmove(win->mat[iser], win->mat[iser]+sf,
 					(win->ws-sf)*sizeof(IntegerMatrix *));
 			}
 		}
 
-		for ( i=0; i<sf; i++ ) {
+		for ( iwin=0; iwin<sf; iwin++ ) {
 			int j;
-			win->img[win->ws-sf+i].serial = 0;
+			win->img[win->ws-sf+iwin].serial = 0;
 			for ( j=0; j<MAX_SER; j++ ) {
-				win->ser[j][win->ws-sf+i] = -1;
-				win->mat[j][win->ws-sf+i] = NULL;
+				win->ser[j][win->ws-sf+iwin] = -1;
+				win->mat[j][win->ws-sf+iwin] = NULL;
 			}
 		}