mirror of https://github.com/DaveGamble/cJSON.git
Add API for adding number with fix decimal places
Signed-off-by: Ajay Bhargav <contact@rickeyworld.info>
This commit is contained in:
parent
b45f48e600
commit
7d89f84712
42
cJSON.c
42
cJSON.c
|
@ -568,14 +568,20 @@ static cJSON_bool print_number(const cJSON * const item, printbuffer * const out
|
|||
}
|
||||
else
|
||||
{
|
||||
/* Try 15 decimal places of precision to avoid nonsignificant nonzero digits */
|
||||
length = sprintf((char*)number_buffer, "%1.15g", d);
|
||||
/* If decimal places are present and value is not an integer type */
|
||||
if (item->decimal_places && (ceil(d) != d)) {
|
||||
/* Then convert it to string */
|
||||
length = sprintf((char*) number_buffer, "%.*f", item->decimal_places, d);
|
||||
} else {
|
||||
/* Try 15 decimal places of precision to avoid nonsignificant nonzero digits */
|
||||
length = sprintf((char*)number_buffer, "%1.15g", d);
|
||||
|
||||
/* Check whether the original double can be recovered */
|
||||
if ((sscanf((char*)number_buffer, "%lg", &test) != 1) || !compare_double((double)test, d))
|
||||
{
|
||||
/* If not, print with 17 decimal places of precision */
|
||||
length = sprintf((char*)number_buffer, "%1.17g", d);
|
||||
/* Check whether the original double can be recovered */
|
||||
if ((sscanf((char*)number_buffer, "%lg", &test) != 1) || !compare_double((double)test, d))
|
||||
{
|
||||
/* If not, print with 17 decimal places of precision */
|
||||
length = sprintf((char*)number_buffer, "%1.17g", d);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -2136,6 +2142,28 @@ CJSON_PUBLIC(cJSON*) cJSON_AddNumberToObject(cJSON * const object, const char *
|
|||
return NULL;
|
||||
}
|
||||
|
||||
CJSON_PUBLIC(cJSON*) cJSON_AddNumberWithPrecisionToObject(cJSON * const object, const char * const name, const double n, int decimal_places)
|
||||
{
|
||||
cJSON *number_item;
|
||||
|
||||
if (decimal_places <= 0 || decimal_places > 14)
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
|
||||
number_item = cJSON_CreateNumber(n);
|
||||
|
||||
number_item->decimal_places = decimal_places;
|
||||
|
||||
if (add_item_to_object(object, name, number_item, &global_hooks, false))
|
||||
{
|
||||
return number_item;
|
||||
}
|
||||
|
||||
cJSON_Delete(number_item);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
CJSON_PUBLIC(cJSON*) cJSON_AddStringToObject(cJSON * const object, const char * const name, const char * const string)
|
||||
{
|
||||
cJSON *string_item = cJSON_CreateString(string);
|
||||
|
|
3
cJSON.h
3
cJSON.h
|
@ -117,6 +117,8 @@ typedef struct cJSON
|
|||
int valueint;
|
||||
/* The item's number, if type==cJSON_Number */
|
||||
double valuedouble;
|
||||
/* Decimal places */
|
||||
int decimal_places;
|
||||
|
||||
/* The item's name string, if this item is the child of, or is in the list of subitems of an object. */
|
||||
char *string;
|
||||
|
@ -266,6 +268,7 @@ CJSON_PUBLIC(cJSON*) cJSON_AddTrueToObject(cJSON * const object, const char * co
|
|||
CJSON_PUBLIC(cJSON*) cJSON_AddFalseToObject(cJSON * const object, const char * const name);
|
||||
CJSON_PUBLIC(cJSON*) cJSON_AddBoolToObject(cJSON * const object, const char * const name, const cJSON_bool boolean);
|
||||
CJSON_PUBLIC(cJSON*) cJSON_AddNumberToObject(cJSON * const object, const char * const name, const double number);
|
||||
CJSON_PUBLIC(cJSON*) cJSON_AddNumberWithPrecisionToObject(cJSON * const object, const char * const name, const double n, int decimal_places);
|
||||
CJSON_PUBLIC(cJSON*) cJSON_AddStringToObject(cJSON * const object, const char * const name, const char * const string);
|
||||
CJSON_PUBLIC(cJSON*) cJSON_AddRawToObject(cJSON * const object, const char * const name, const char * const raw);
|
||||
CJSON_PUBLIC(cJSON*) cJSON_AddObjectToObject(cJSON * const object, const char * const name);
|
||||
|
|
Loading…
Reference in New Issue