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

print_number: rename variables

Browse Source
This commit is contained in:
Max Bruckner 2017-02-20 11:41:40 +01:00
parent 61921498d0
commit 6815d96617
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
cJSON.c
View File

@ -320,12 +320,12 @@ static size_t update(const printbuffer *p)
} }
/* Render the number nicely from the given item into a string. */ /* Render the number nicely from the given item into a string. */
static unsigned char *print_number(const cJSON *item, printbuffer *p) static unsigned char *print_number(const cJSON * const item, printbuffer * const output_buffer)
{ {
unsigned char *str = NULL; unsigned char *output_pointer = NULL;
double d = item->valuedouble; double d = item->valuedouble;
if (p == NULL) if (output_buffer == NULL)
{ {
return NULL; return NULL;
} }
@ -333,41 +333,41 @@ static unsigned char *print_number(const cJSON *item, printbuffer *p)
/* value is an int */ /* value is an int */
if ((fabs(((double)item->valueint) - d) <= DBL_EPSILON) && (d <= INT_MAX) && (d >= INT_MIN)) if ((fabs(((double)item->valueint) - d) <= DBL_EPSILON) && (d <= INT_MAX) && (d >= INT_MIN))
{ {
/* 2^64+1 can be represented in 21 chars. */ /* 2^64+1 can be represented in 21 chars. */
str = ensure(p, 21); output_pointer = ensure(output_buffer, 21);
if (str != NULL) if (output_pointer != NULL)
{ {
sprintf((char*)str, "%d", item->valueint); sprintf((char*)output_pointer, "%d", item->valueint);
} }
} }
/* value is a floating point number */ /* value is a floating point number */
else else
{ {
/* This is a nice tradeoff. */ /* This is a nice tradeoff. */
str = ensure(p, 64); output_pointer = ensure(output_buffer, 64);
if (str != NULL) if (output_pointer != NULL)
{ {
/* This checks for NaN and Infinity */ /* This checks for NaN and Infinity */
if ((d * 0) != 0) if ((d * 0) != 0)
{ {
sprintf((char*)str, "null"); sprintf((char*)output_pointer, "null");
} }
else if ((fabs(floor(d) - d) <= DBL_EPSILON) && (fabs(d) < 1.0e60)) else if ((fabs(floor(d) - d) <= DBL_EPSILON) && (fabs(d) < 1.0e60))
{ {
sprintf((char*)str, "%.0f", d); sprintf((char*)output_pointer, "%.0f", d);
} }
else if ((fabs(d) < 1.0e-6) || (fabs(d) > 1.0e9)) else if ((fabs(d) < 1.0e-6) || (fabs(d) > 1.0e9))
{ {
sprintf((char*)str, "%e", d); sprintf((char*)output_pointer, "%e", d);
} }
else else
{ {
sprintf((char*)str, "%f", d); sprintf((char*)output_pointer, "%f", d);
} }
} }
} }
return str; return output_pointer;
} }
/* parse 4 digit hexadecimal number */ /* parse 4 digit hexadecimal number */