diff options
author | Thomas White <taw@physics.org> | 2013-12-17 15:12:33 +0100 |
---|---|---|
committer | Thomas White <taw@physics.org> | 2013-12-17 15:12:33 +0100 |
commit | 3f25930e9f0135b3714573807d06133898ea6771 (patch) | |
tree | cbf874c9c7f50afbe181cec85155aa6182c00e61 | |
parent | 28f8385969dbdb2f8db9c95d3d431c73319e9f25 (diff) |
Fix a few compiler warnings
-rw-r--r-- | libcrystfel/src/utils.c | 2 | ||||
-rw-r--r-- | src/diffraction.c | 6 | ||||
-rw-r--r-- | src/dw-hdfsee.c | 1 |
3 files changed, 2 insertions, 7 deletions
diff --git a/libcrystfel/src/utils.c b/libcrystfel/src/utils.c index 6c731a83..2f5107e3 100644 --- a/libcrystfel/src/utils.c +++ b/libcrystfel/src/utils.c @@ -106,7 +106,7 @@ void show_matrix(gsl_matrix *M) size_t notrail(char *s) { - size_t i; + ssize_t i; size_t munched = 0; for ( i=strlen(s)-1; i>=0; i-- ) { diff --git a/src/diffraction.c b/src/diffraction.c index b76154c2..2f764987 100644 --- a/src/diffraction.c +++ b/src/diffraction.c @@ -178,9 +178,6 @@ static double interpolate_linear(const double *ref, const unsigned char *flags, val1 = sym_lookup_intensity(ref, flags, sym, h, k, l); val2 = sym_lookup_intensity(ref, flags, sym, h+1, k, l); - val1 = val1; - val2 = val2; - return (1.0-f)*val1 + f*val2; } @@ -251,9 +248,6 @@ static double complex interpolate_phased_linear(const double *ref, ph1 = sym_lookup_phase(phases, flags, sym, h, k, l); ph2 = sym_lookup_phase(phases, flags, sym, h+1, k, l); - val1 = val1; - val2 = val2; - /* Calculate real and imaginary parts */ re1 = val1 * cos(ph1); im1 = val1 * sin(ph1); diff --git a/src/dw-hdfsee.c b/src/dw-hdfsee.c index 7c33d755..387db45c 100644 --- a/src/dw-hdfsee.c +++ b/src/dw-hdfsee.c @@ -50,6 +50,7 @@ #include "filters.h" +/* FIXME: this trusts that 'message' doesn't contain any format strings */ static void displaywindow_error(DisplayWindow *dw, const char *message) { GtkWidget *window; |