diff options
| author | Thomas White <taw@physics.org> | 2021-07-21 15:22:12 +0200 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2021-07-22 11:22:18 +0200 |
| commit | 13d65b9785d1557e29f5f06871d01bad8e76e44c (patch) | |
| tree | dfd9c52a80639882695eb63b0c87af06ebcbb29d /src/process_hkl.c | |
| parent | d5cf0404a08253f52c6ddf3f6d80e694b9de4e7a (diff) | |
Clean up shadowed variables
Diffstat (limited to 'src/process_hkl.c')
| -rw-r--r-- | src/process_hkl.c | 14 |
1 files changed, 7 insertions, 7 deletions
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; } |