From 2cd7f8559f37909ecadb4818304e577116ddfd05 Mon Sep 17 00:00:00 2001
From: Vesa Oikonen <vesoik@utu.fi>
Date: Fri, 21 Dec 2018 12:37:33 +0200
Subject: [PATCH] fabsf() to fabs() in order to prevent compiler warning in
macOS
---
v2/libtpcextensions/test_floatutil.c | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/v2/libtpcextensions/test_floatutil.c b/v2/libtpcextensions/test_floatutil.c
index 09d53688..3482538a 100644
--- a/v2/libtpcextensions/test_floatutil.c
+++ b/v2/libtpcextensions/test_floatutil.c
@@ -343,33 +343,34 @@ int test_floatGetWithUnit(
ret=floatGetWithUnit(str, &v, NULL); if(verbose>2) printf(" -> %g\n", v);
if(ret==0 || !isnan(v)) return(4);
+ // below fabs() used instead of fabsf() because compiler converts values to doubles
strcpy(str, "1.2345"); if(verbose>1) printf("str := '%s'\n", str);
ret=floatGetWithUnit(str, &v, NULL); if(verbose>2) printf(" -> %g\n", v);
- if(ret!=0 || fabsf(v-1.2345)>1.0E-006) return(11);
+ if(ret!=0 || fabs(v-1.2345)>1.0E-006) return(11);
strcpy(str, "1,2345"); if(verbose>1) printf("str := '%s'\n", str);
ret=floatGetWithUnit(str, &v, NULL); if(verbose>2) printf(" -> %g\n", v);
- if(ret!=0 || fabsf(v-1.2345)>1.0E-006) return(12);
+ if(ret!=0 || fabs(v-1.2345)>1.0E-006) return(12);
strcpy(str, "+1.2345E4"); if(verbose>1) printf("str := '%s'\n", str);
ret=floatGetWithUnit(str, &v, NULL); if(verbose>2) printf(" -> %g\n", v);
- if(ret!=0 || fabsf(v-12345)>1.0E-006) return(13);
+ if(ret!=0 || fabs(v-12345.0)>1.0E-006) return(13);
strcpy(str, "-1,2345E4"); if(verbose>1) printf("str := '%s'\n", str);
ret=floatGetWithUnit(str, &v, NULL); if(verbose>2) printf(" -> %g\n", v);
- if(ret!=0 || fabsf(v-(-12345))>1.0E-006) return(14);
+ if(ret!=0 || fabs(v-(-12345.0))>1.0E-006) return(14);
strcpy(str, "1.2345 sec"); if(verbose>1) printf("str := '%s'\n", str);
ret=floatGetWithUnit(str, &v, &unit);
if(verbose>2) printf(" -> %g %s\n", v, unitName(unit));
- if(ret!=0 || fabsf(v-1.2345)>1.0E-006 || unit!=UNIT_SEC) return(21);
+ if(ret!=0 || fabs(v-1.2345)>1.0E-006 || unit!=UNIT_SEC) return(21);
strcpy(str, "1,2345 viallinen"); if(verbose>1) printf("str := '%s'\n", str);
ret=floatGetWithUnit(str, &v, &unit);
if(verbose>2) printf(" -> %g %s\n", v, unitName(unit));
- if(ret!=0 || fabsf(v-1.2345)>1.0E-006 || unit!=UNIT_UNKNOWN) return(22);
+ if(ret!=0 || fabs(v-1.2345)>1.0E-006 || unit!=UNIT_UNKNOWN) return(22);
strcpy(str, "+1.2345E4 min"); if(verbose>1) printf("str := '%s'\n", str);
ret=floatGetWithUnit(str, &v, &unit); if(verbose>2) printf(" -> %g\n", v);
- if(ret!=0 || fabsf(v-12345)>1.0E-006 || unit!=UNIT_MIN) return(23);
+ if(ret!=0 || fabs(v-12345.0)>1.0E-006 || unit!=UNIT_MIN) return(23);
strcpy(str, "-1,2345E4 1/min"); if(verbose>1) printf("str := '%s'\n", str);
ret=floatGetWithUnit(str, &v, &unit); if(verbose>2) printf(" -> %g\n", v);
- if(ret!=0 || fabsf(v-(-12345))>1.0E-006 || unit!=UNIT_PER_MIN) return(24);
+ if(ret!=0 || fabs(v-(-12345.0))>1.0E-006 || unit!=UNIT_PER_MIN) return(24);
statusSet(status, __func__, __FILE__, __LINE__, 0);
return(0);
--
GitLab