|
|
@@ -10,58 +10,58 @@ using namespace ArduinoJson::Parser;
|
|
|
|
|
|
int JsonObjectBase::getNestedTokenCount(jsmntok_t* token)
|
|
|
{
|
|
|
- int end = token->end;
|
|
|
- int count = 0;
|
|
|
+ int end = token->end;
|
|
|
+ int count = 0;
|
|
|
|
|
|
- token++;
|
|
|
+ token++;
|
|
|
|
|
|
- while (token->start < end)
|
|
|
- {
|
|
|
- token++;
|
|
|
- count++;
|
|
|
- }
|
|
|
+ while (token->start < end)
|
|
|
+ {
|
|
|
+ token++;
|
|
|
+ count++;
|
|
|
+ }
|
|
|
|
|
|
- return count;
|
|
|
+ return count;
|
|
|
}
|
|
|
|
|
|
bool JsonObjectBase::getBoolFromToken(jsmntok_t* token)
|
|
|
{
|
|
|
- if (token->type != JSMN_PRIMITIVE) return 0;
|
|
|
+ if (token == 0 || token->type != JSMN_PRIMITIVE) return 0;
|
|
|
|
|
|
- // "true"
|
|
|
- if (json[token->start] == 't') return true;
|
|
|
+ // "true"
|
|
|
+ if (json[token->start] == 't') return true;
|
|
|
|
|
|
- // "false"
|
|
|
- if (json[token->start] == 'f') return false;
|
|
|
+ // "false"
|
|
|
+ if (json[token->start] == 'f') return false;
|
|
|
|
|
|
- // "null"
|
|
|
- if (json[token->start] == 'n') return false;
|
|
|
-
|
|
|
- // number
|
|
|
- return strtol(json + token->start, 0, 0) != 0;
|
|
|
+ // "null"
|
|
|
+ if (json[token->start] == 'n') return false;
|
|
|
+
|
|
|
+ // number
|
|
|
+ return strtol(json + token->start, 0, 0) != 0;
|
|
|
}
|
|
|
|
|
|
double JsonObjectBase::getDoubleFromToken(jsmntok_t* token)
|
|
|
{
|
|
|
- if (token == 0 || token->type != JSMN_PRIMITIVE) return 0;
|
|
|
+ if (token == 0 || token->type != JSMN_PRIMITIVE) return 0;
|
|
|
|
|
|
- return strtod(json + token->start, 0);
|
|
|
+ return strtod(json + token->start, 0);
|
|
|
}
|
|
|
|
|
|
long JsonObjectBase::getLongFromToken(jsmntok_t* token)
|
|
|
{
|
|
|
- if (token == 0 || token->type != JSMN_PRIMITIVE) return 0;
|
|
|
+ if (token == 0 || token->type != JSMN_PRIMITIVE) return 0;
|
|
|
|
|
|
- return strtol(json + token->start, 0, 0);
|
|
|
+ return strtol(json + token->start, 0, 0);
|
|
|
}
|
|
|
|
|
|
char* JsonObjectBase::getStringFromToken(jsmntok_t* token)
|
|
|
{
|
|
|
- if (token == 0 || token->type != JSMN_PRIMITIVE && token->type != JSMN_STRING)
|
|
|
- return 0;
|
|
|
+ if (token == 0 || token->type != JSMN_PRIMITIVE && token->type != JSMN_STRING)
|
|
|
+ return 0;
|
|
|
|
|
|
- // add null terminator to the string
|
|
|
- json[token->end] = 0;
|
|
|
+ // add null terminator to the string
|
|
|
+ json[token->end] = 0;
|
|
|
|
|
|
- return json + token->start;
|
|
|
+ return json + token->start;
|
|
|
}
|