aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas White <taw@physics.org>2017-07-21 11:39:27 +0200
committerThomas White <taw@physics.org>2017-07-21 11:39:27 +0200
commit1585396d6bbe3375d21b2906251ee6762a6fcca4 (patch)
treeb009efdce0f787d63a262619870037710f3256e6
parentc47b072d15a1e4828e052910bbdab8c7c4bd88de (diff)
Tidy up some warnings
-rw-r--r--src/cell_explorer.c3
-rw-r--r--src/merge.c5
-rw-r--r--src/rejection.c2
3 files changed, 6 insertions, 4 deletions
diff --git a/src/cell_explorer.c b/src/cell_explorer.c
index f6c2c590..f13a2e8b 100644
--- a/src/cell_explorer.c
+++ b/src/cell_explorer.c
@@ -1045,7 +1045,8 @@ static int guess_centering(HistoBox *b, UnitCell *cell)
long int tots[8];
long int max = 0;
long int total = 0;
- int i, j, mxj;
+ int i, j;
+ int mxj = 99;
/* Since the six histograms (a,b,c,al,be,ga) come from the same cells,
* we only need to look at one of them */
diff --git a/src/merge.c b/src/merge.c
index 9734c469..2be136a1 100644
--- a/src/merge.c
+++ b/src/merge.c
@@ -158,7 +158,8 @@ static void run_merge_job(void *vwargs, int cookie)
Reflection *f;
signed int h, k, l;
double mean, sumweight, M2, temp, delta, R;
- double corr, res, w, esd;
+ double corr, res, w;
+ //double esd;
if ( get_partiality(refl) < MIN_PART_MERGE ) continue;
@@ -199,7 +200,7 @@ static void run_merge_job(void *vwargs, int cookie)
continue;
}
- esd = get_esd_intensity(refl) * corr;
+ //esd = get_esd_intensity(refl) * corr;
w = 1.0;
/* Running mean and variance calculation */
diff --git a/src/rejection.c b/src/rejection.c
index 441a83e6..10f13f9c 100644
--- a/src/rejection.c
+++ b/src/rejection.c
@@ -155,7 +155,7 @@ static void check_cc(Crystal *cr, RefList *full)
}
-static void check_ccs(Crystal **crystals, int n_crystals, RefList *full)
+static UNUSED void check_ccs(Crystal **crystals, int n_crystals, RefList *full)
{
int i;