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

Meaningful error codes instead of plain -1

Browse Source
This commit is contained in:
Pavel Kirienko
2014-03-28 19:21:08 +04:00
parent 4886e2194f
commit ae63ad5db5
34 changed files with 112 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libuavcan/include/uavcan/marshal/array.hpp
+4 -3
View File
@@ -10,6 +10,7 @@
#include <algorithm>
#include <stdexcept>
#include <cstring>
#include <uavcan/error.hpp>
#include <uavcan/fatal_error.hpp>
#include <uavcan/util/compile_time.hpp>
#include <uavcan/impl_constants.hpp>
@@ -308,7 +309,7 @@ class Array : public ArrayImpl<T, ArrayMode, MaxSize_>
}
if (size() == MaxSize_) // Error: Max array length reached, but the end of stream is not
{
return -1;
return -ErrInvalidMarshalData;
}
push_back(value);
}
@@ -323,7 +324,7 @@ class Array : public ArrayImpl<T, ArrayMode, MaxSize_>
}
if ((sz > 0) && ((sz - 1u) > (MaxSize_ - 1u))) // -Werror=type-limits
{
return -1;
return -ErrInvalidMarshalData;
}
resize(sz);
if (sz == 0)
@@ -333,7 +334,7 @@ class Array : public ArrayImpl<T, ArrayMode, MaxSize_>
return decodeImpl(codec, tao_mode, FalseType());
}
assert(0); // Unreachable
return -1;
return -ErrLogic;
}
public: