aboutsummaryrefslogtreecommitdiff
path: root/libcrystfel/src/utils.c
diff options
context:
space:
mode:
Diffstat (limited to 'libcrystfel/src/utils.c')
-rw-r--r--libcrystfel/src/utils.c17
1 files changed, 16 insertions, 1 deletions
diff --git a/libcrystfel/src/utils.c b/libcrystfel/src/utils.c
index 945fee15..864b1a30 100644
--- a/libcrystfel/src/utils.c
+++ b/libcrystfel/src/utils.c
@@ -307,7 +307,22 @@ void ERROR(const char *format, ...)
int convert_int(const char *str, int *pval)
{
- int val;
+ long int val;
+ char *rval;
+
+ val = strtol(str, &rval, 10);
+ if ( *rval != '\0' ) {
+ return 1;
+ } else {
+ *pval = val;
+ return 0;
+ }
+}
+
+
+int convert_float(const char *str, double *pval)
+{
+ double val;
char *rval;
val = strtod(str, &rval);