ua1zbe
/
svxlink
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bugfix in jsonToString method.

This commit is contained in:
Adi Bier / DL1HRC 2023-01-24 22:52:30 +01:00
parent 8b549d6024
commit 5f75990cb0
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/svxlink/reflector/Reflector.cpp
View File

@ -949,12 +949,8 @@ void Reflector::writeUserData(std::map<std::string, User> userdata)
string Reflector::jsonToString(Json::Value eventmessage)
{
Json::StreamWriterBuilder builder;
std::unique_ptr<Json::StreamWriter> writer(builder.newStreamWriter());
std::ostringstream ostream;
writer->write(eventmessage, &ostream);
std::string message = ostream.str();
message.erase(std::remove_if(message.begin(), message.end(),
[](unsigned char x){return std::iscntrl(x);}));
builder["indentation"] = "";
std::string message = Json::writeString(builder, eventmessage);
return message;
} /* Reflector::jsonToString */

2
src/svxlink/svxlink/contrib/UsrpLogic/UsrpLogic.cpp
View File

@ -87,7 +87,7 @@ using namespace Async;
****************************************************************************/
#define USRPSOFT "SvxLink-Usrp"
#define USRPVERSION "v24102022"
#define USRPVERSION "24012023"
#define LOGERROR 0
#define LOGWARN 1