Compare commits

..

No commits in common. "124eb640182af6919984624b6044ecf3bf37450e" and "219d8201041985edb6f605286969d5d5e5dac485" have entirely different histories.

2 changed files with 10 additions and 10 deletions

View File

@ -23,12 +23,12 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
{ {
if (cfg == nullptr) if (cfg == nullptr)
{ {
fprintf(stderr, "TariffConfiguration pointer not set\n"); printf("TariffConfiguration pointer not set\n");
return false; return false;
} }
if (json == NULL) if (json == NULL)
{ {
fprintf(stderr, "%s", "Input JSON string is NULL\n"); printf("%s", "Input JSON string is NULL\n");
return false; return false;
} }
@ -40,17 +40,17 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
ParseErrorCode err = document.GetParseError(); ParseErrorCode err = document.GetParseError();
if (err != 0) if (err != 0)
{ {
fprintf(stderr, "%s %d (%s)\n", "Unable to parse JSON, error code:", err, GetParseError_En(err)); printf("%s %d (%s)\n", "Unable to parse JSON, error code:", err, GetParseError_En(err));
return false; return false;
} }
// Validate JSON, check if it's a JSON object // Validate JSON, check if it's a JSON object
fprintf(stderr, "%s", "JSON parsing has been successful\n"); printf("%s", "JSON parsing has been successful\n");
if (!document.IsObject()) { if (!document.IsObject()) {
fprintf(stderr, "%s", "Error: not a (valid) JSON object\n"); printf("%s", "Error: not a (valid) JSON object\n");
return false; return false;
} }
fprintf(stderr, "%s", "Valid JSON object identified\n"); printf("%s", "Valid JSON object identified\n");
// Validate JSON, check configuration members // Validate JSON, check configuration members
if (!document.HasMember("Currency") if (!document.HasMember("Currency")
@ -65,7 +65,7 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
printf("%s", "Error: not a valid configuration JSON\n"); printf("%s", "Error: not a valid configuration JSON\n");
return false; return false;
} }
fprintf(stderr, "%s", "Valid JSON configuration identified\n"); printf("%s", "Valid JSON configuration identified\n");
ATBCurrency Currency; ATBCurrency Currency;
ATBDuration Duration; ATBDuration Duration;
@ -115,7 +115,7 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
const char* inner_obj_name = k->name.GetString(); const char* inner_obj_name = k->name.GetString();
if (inner_obj_name == NULL) if (inner_obj_name == NULL)
{ {
fprintf(stderr, "Inner object name is NULL\n"); printf("Inner object name is NULL\n");
continue; continue;
} }
@ -240,7 +240,7 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
return true; return true;
} }
catch (...) { catch (...) {
fprintf(stderr, "%s\n", "General exception has occurred while parsing JSON\n"); printf("%s\n", "General exception has occurred while parsing JSON\n");
return false; return false;
} }
} }

File diff suppressed because one or more lines are too long