fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-20 15:43:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Cleaner YAML streaming for strings

Browse Source
This commit is contained in:
Pavel Kirienko
2014-03-07 00:58:14 +04:00
parent 4753d4ac79
commit 35e4fd00fc
2 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libuavcan/include/uavcan/internal/marshal/array.hpp
+14 -3
View File
@@ -420,6 +420,17 @@ class YamlStreamer<Array<T, ArrayMode, MaxSize> >
{
typedef Array<T, ArrayMode, MaxSize> ArrayType;
static bool isNiceCharacter(int c)
{
if (c >= 32 && c <= 126)
return true;
static const char Good[] = {'\n', '\r', '\t'};
for (unsigned int i = 0; i < sizeof(Good) / sizeof(Good[0]); i++)
if (Good[i] == c)
return true;
return false;
}
template <typename Stream>
static void streamPrimitives(Stream& s, const ArrayType& array)
{
@@ -439,8 +450,8 @@ class YamlStreamer<Array<T, ArrayMode, MaxSize> >
s << '"';
for (std::size_t i = 0; i < array.size(); i++)
{
const unsigned int c = array.at(i);
if (c < 32 || c > 126) // Non-printable characters
const int c = array.at(i);
if (c < 32 || c > 126)
{
char nibbles[2] = {(c >> 4) & 0xF, c & 0xF};
for (int i = 0; i < 2; i++)
@@ -471,7 +482,7 @@ class YamlStreamer<Array<T, ArrayMode, MaxSize> >
bool printable_only = true;
for (int i = 0; i < array.size(); i++)
{
if (array[i] < 32 || array[i] > 126)
if (!isNiceCharacter(array[i]))
{
printable_only = false;
break;