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

parse_hex4: deduplicate into a for loop

Browse Source
This commit is contained in:
Max Bruckner 2017-02-06 23:01:18 +01:00
parent 0747669972
commit d7b5545748
1 changed files with 25 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
cJSON.c
View File

@ -362,8 +362,11 @@ static unsigned char *print_number(const cJSON *item, printbuffer *p)
static unsigned parse_hex4(const unsigned char *str) static unsigned parse_hex4(const unsigned char *str)
{ {
unsigned int h = 0; unsigned int h = 0;
size_t i = 0;
/* first digit */ for (i = 0; i < 4; i++)
{
/* parse digit */
if ((*str >= '0') && (*str <= '9')) if ((*str >= '0') && (*str <= '9'))
{ {
h += (unsigned int) (*str) - '0'; h += (unsigned int) (*str) - '0';
@ -381,65 +384,12 @@ static unsigned parse_hex4(const unsigned char *str)
return 0; return 0;
} }
if (i < 3)
/* second digit */ {
/* shift left to make place for the next nibble */
h = h << 4; h = h << 4;
str++; str++;
if ((*str >= '0') && (*str <= '9'))
{
h += (unsigned int) (*str) - '0';
} }
else if ((*str >= 'A') && (*str <= 'F'))
{
h += (unsigned int) 10 + (*str) - 'A';
}
else if ((*str >= 'a') && (*str <= 'f'))
{
h += (unsigned int) 10 + (*str) - 'a';
}
else /* invalid */
{
return 0;
}
/* third digit */
h = h << 4;
str++;
if ((*str >= '0') && (*str <= '9'))
{
h += (unsigned int) (*str) - '0';
}
else if ((*str >= 'A') && (*str <= 'F'))
{
h += (unsigned int) 10 + (*str) - 'A';
}
else if ((*str >= 'a') && (*str <= 'f'))
{
h += (unsigned int) 10 + (*str) - 'a';
}
else /* invalid */
{
return 0;
}
/* fourth digit */
h = h << 4;
str++;
if ((*str >= '0') && (*str <= '9'))
{
h += (unsigned int) (*str) - '0';
}
else if ((*str >= 'A') && (*str <= 'F'))
{
h += (unsigned int) 10 + (*str) - 'A';
}
else if ((*str >= 'a') && (*str <= 'f'))
{
h += (unsigned int) 10 + (*str) - 'a';
}
else /* invalid */
{
return 0;
} }
return h; return h;