mirror of
https://github.com/DaveGamble/cJSON.git
synced 2023-08-10 21:13:26 +03:00
parse_number: improve variable names + const correctness
This commit is contained in:
parent
efb5e1bc93
commit
15592c50f6
16
cJSON.c
16
cJSON.c
@ -154,21 +154,20 @@ void cJSON_Delete(cJSON *c)
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* Parse the input text to generate a number, and populate the result into item. */
|
/* Parse the input text to generate a number, and populate the result into item. */
|
||||||
static const unsigned char *parse_number(cJSON *item, const unsigned char *num)
|
static const unsigned char *parse_number(cJSON * const item, const unsigned char * const input)
|
||||||
{
|
{
|
||||||
double number = 0;
|
double number = 0;
|
||||||
unsigned char *endpointer = NULL;
|
unsigned char *after_end = NULL;
|
||||||
|
|
||||||
if (num == NULL)
|
if (input == NULL)
|
||||||
{
|
{
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
number = strtod((const char*)num, (char**)&endpointer);
|
number = strtod((const char*)input, (char**)&after_end);
|
||||||
if ((num == endpointer) || (num == NULL))
|
if (input == after_end)
|
||||||
{
|
{
|
||||||
/* parse_error */
|
return NULL; /* parse_error */
|
||||||
return NULL;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
item->valuedouble = number;
|
item->valuedouble = number;
|
||||||
@ -186,9 +185,10 @@ static const unsigned char *parse_number(cJSON *item, const unsigned char *num)
|
|||||||
{
|
{
|
||||||
item->valueint = (int)number;
|
item->valueint = (int)number;
|
||||||
}
|
}
|
||||||
|
|
||||||
item->type = cJSON_Number;
|
item->type = cJSON_Number;
|
||||||
|
|
||||||
return endpointer;
|
return after_end;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* don't ask me, but the original cJSON_SetNumberValue returns an integer or double */
|
/* don't ask me, but the original cJSON_SetNumberValue returns an integer or double */
|
||||||
|
Loading…
Reference in New Issue
Block a user