aboutsummaryrefslogtreecommitdiff
path: root/src/process_hkl.c
diff options
context:
space:
mode:
authorChuck <chun.hong.yoon@desy.de>2014-05-30 15:52:17 +0200
committerThomas White <taw@physics.org>2014-06-02 14:26:34 +0200
commit108ef182aae36252a8d37ddf443d05156b6161e5 (patch)
treef929110d0247f374ed0a44c084a621c175be7ac5 /src/process_hkl.c
parent9a6b7b16b4497c3f581d1ab0b795fd36359c69c0 (diff)
try is a keyword in c++
Diffstat (limited to 'src/process_hkl.c')
-rw-r--r--src/process_hkl.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/process_hkl.c b/src/process_hkl.c
index e3ae1302..2497215a 100644
--- a/src/process_hkl.c
+++ b/src/process_hkl.c
@@ -11,6 +11,7 @@
* 2009-2014 Thomas White <taw@physics.org>
* 2011 Andrew Martin <andrew.martin@desy.de>
* 2012 Lorenzo Galli <lorenzo.galli@desy.de>
+ * 2014 Chunhong Yoon <chun.hong.yoon@desy.de>
*
* This file is part of CrystFEL.
*
@@ -182,18 +183,18 @@ static double scale_intensities(RefList *reference, RefList *new,
static double *check_hist_size(int n, double *hist_vals)
{
int ns;
- double *try;
+ double *tryMe;
if ( n % 1000 ) return hist_vals;
ns = n / 1000;
ns = (ns+1)*1000;
- try = realloc(hist_vals, ns*sizeof(double));
- if ( try == NULL ) {
+ tryMe = realloc(hist_vals, ns*sizeof(double));
+ if ( tryMe == NULL ) {
ERROR("Failed to allocate space for histogram.\n");
}
- return try;
+ return tryMe;
}