github-mirrors/thirdparty-ArduinoJson
1
0
Fork 0
mirror of https://github.com/eledio-devices/thirdparty-ArduinoJson.git synced 2025-10-31 08:42:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Renamed JsonObjectBase::getNestedTokenCounts() into getNestedTokenCount()

Browse Source
This commit is contained in:
Benoit Blanchon
2014-01-11 15:23:08 +01:00
parent 43717bff1e
commit da37162a94
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
JsonArray.cpp
View File

@@ -18,7 +18,7 @@ jsmntok_t* JsonArray::getToken(int index)
for (int i = 0; i < index; i++)
{
// move forward: current + nested tokens
currentToken += 1 + getNestedTokenCounts(currentToken);
currentToken += 1 + getNestedTokenCount(currentToken);
}
return &tokens[currentToken];

2
JsonHashTable.cpp
View File

@@ -31,7 +31,7 @@ jsmntok_t* JsonHashTable::getToken(char* name)
}
// move forward: key + value + nested tokens
currentToken += 2 + getNestedTokenCounts(currentToken + 1);
currentToken += 2 + getNestedTokenCount(currentToken + 1);
}
// nothing found, return NULL

4
JsonObjectBase.cpp
View File

@@ -6,13 +6,13 @@
#include "JsonObjectBase.h"
int JsonObjectBase::getNestedTokenCounts(int tokenIndex)
int JsonObjectBase::getNestedTokenCount(int tokenIndex)
{
int count = 0;
for (int i = 0; i < tokens[tokenIndex].size; i++)
{
count += 1 + getNestedTokenCounts(tokenIndex + 1 + i);
count += 1 + getNestedTokenCount(tokenIndex + 1 + i);
}
return count;

2
JsonObjectBase.h
View File

@@ -32,7 +32,7 @@ protected:
this->tokens = tokens;
}
int getNestedTokenCounts(int tokenIndex);
int getNestedTokenCount(int tokenIndex);
char* json;
jsmntok_t* tokens;