Compare commits

...

2 Commits

Author SHA1 Message Date
124eb64018 Use fprintf instead of printf. 2023-05-12 10:04:04 +02:00
4bc343c5b2 Add tariff Zone_1. unit_id set to 3. 2023-05-12 10:03:30 +02:00
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)
{
printf("TariffConfiguration pointer not set\n");
fprintf(stderr, "TariffConfiguration pointer not set\n");
return false;
}
if (json == NULL)
{
printf("%s", "Input JSON string is NULL\n");
fprintf(stderr, "%s", "Input JSON string is NULL\n");
return false;
}
@ -40,17 +40,17 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
ParseErrorCode err = document.GetParseError();
if (err != 0)
{
printf("%s %d (%s)\n", "Unable to parse JSON, error code:", err, GetParseError_En(err));
fprintf(stderr, "%s %d (%s)\n", "Unable to parse JSON, error code:", err, GetParseError_En(err));
return false;
}
// Validate JSON, check if it's a JSON object
printf("%s", "JSON parsing has been successful\n");
fprintf(stderr, "%s", "JSON parsing has been successful\n");
if (!document.IsObject()) {
printf("%s", "Error: not a (valid) JSON object\n");
fprintf(stderr, "%s", "Error: not a (valid) JSON object\n");
return false;
}
printf("%s", "Valid JSON object identified\n");
fprintf(stderr, "%s", "Valid JSON object identified\n");
// Validate JSON, check configuration members
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");
return false;
}
printf("%s", "Valid JSON configuration identified\n");
fprintf(stderr, "%s", "Valid JSON configuration identified\n");
ATBCurrency Currency;
ATBDuration Duration;
@ -115,7 +115,7 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
const char* inner_obj_name = k->name.GetString();
if (inner_obj_name == NULL)
{
printf("Inner object name is NULL\n");
fprintf(stderr, "Inner object name is NULL\n");
continue;
}
@ -240,7 +240,7 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
return true;
}
catch (...) {
printf("%s\n", "General exception has occurred while parsing JSON\n");
fprintf(stderr, "%s\n", "General exception has occurred while parsing JSON\n");
return false;
}
}

File diff suppressed because one or more lines are too long