mirror/cJSON
1
0
Fork 0
mirror of https://github.com/DaveGamble/cJSON.git synced 2023-08-10 21:13:26 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #384 from Alanscut/eliminate_warning

Browse Source 
eliminate warning when compiling cJSON
This commit is contained in:
Alanscut 2019-08-28 20:57:02 +08:00 committed by GitHub
commit cf0d87a095
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/unity/src/unity.c
View File

@ -268,14 +268,14 @@ void UnityPrintFloat(const UNITY_DOUBLE input_number)
UNITY_DOUBLE number = input_number; UNITY_DOUBLE number = input_number;
/* print minus sign (including for negative zero) */ /* print minus sign (including for negative zero) */
if (number < 0.0f || (number == 0.0f && 1.0f / number < 0.0f)) if (number < (double)0.0f || (number == (double)0.0f && (double)1.0f / number < (double)0.0f))
{ {
UNITY_OUTPUT_CHAR('-'); UNITY_OUTPUT_CHAR('-');
number = -number; number = -number;
} }
/* handle zero, NaN, and +/- infinity */ /* handle zero, NaN, and +/- infinity */
if (number == 0.0f) UnityPrint("0"); if (number == (double)0.0f) UnityPrint("0");
else if (isnan(number)) UnityPrint("nan"); else if (isnan(number)) UnityPrint("nan");
else if (isinf(number)) UnityPrint("inf"); else if (isinf(number)) UnityPrint("inf");
else else
@ -286,10 +286,10 @@ void UnityPrintFloat(const UNITY_DOUBLE input_number)
char buf[16]; char buf[16];
/* scale up or down by powers of 10 */ /* scale up or down by powers of 10 */
while (number < 100000.0f / 1e6f) { number *= 1e6f; exponent -= 6; } while (number < (double)(100000.0f / 1e6f)) { number *= (double)1e6f; exponent -= 6; }
while (number < 100000.0f) { number *= 10.0f; exponent--; } while (number < (double)100000.0f) { number *= (double)10.0f; exponent--; }
while (number > 1000000.0f * 1e6f) { number /= 1e6f; exponent += 6; } while (number > (double)(1000000.0f * 1e6f)) { number /= (double)1e6f; exponent += 6; }
while (number > 1000000.0f) { number /= 10.0f; exponent++; } while (number > (double)1000000.0f) { number /= (double)10.0f; exponent++; }
/* round to nearest integer */ /* round to nearest integer */
n = ((UNITY_INT32)(number + number) + 1) / 2; n = ((UNITY_INT32)(number + number) + 1) / 2;