fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-05-22 17:57:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

C++ library usage fix: snprintf() may or may not be in std::

Browse Source
This commit is contained in:
Pavel Kirienko
2014-04-02 13:53:39 +04:00
parent cdd0ff3a28
commit 9e91cd1e7c
5 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libuavcan/include/uavcan/marshal/array.hpp
+2 -1
View File
@@ -503,7 +503,8 @@ public:
const SizeType max_size = capacity() - size();
// We have one extra byte for the null terminator, hence +1
const int ret = std::snprintf(reinterpret_cast<char*>(ptr), max_size + 1, format, value);
using namespace std; // For snprintf()
const int ret = snprintf(reinterpret_cast<char*>(ptr), max_size + 1, format, value);
for (int i = 0; i < std::min(ret, int(max_size)); i++)
{
libuavcan/include/uavcan/time.hpp
+4 -2
View File
@@ -204,7 +204,8 @@ template <typename Stream, typename D>
inline Stream& operator<<(Stream& s, DurationBase<D> d)
{
char buf[8];
std::snprintf(buf, sizeof(buf), "%06lu", static_cast<unsigned long>(std::abs(d.toUSec() % 1000000L)));
using namespace std; // For snprintf()
snprintf(buf, sizeof(buf), "%06lu", static_cast<unsigned long>(std::abs(d.toUSec() % 1000000L)));
if (d.isNegative())
{
s << '-';
@@ -217,7 +218,8 @@ template <typename Stream, typename T, typename D>
inline Stream& operator<<(Stream& s, TimeBase<T, D> t)
{
char buf[8];
std::snprintf(buf, sizeof(buf), "%06lu", static_cast<unsigned long>(t.toUSec() % 1000000L));
using namespace std; // For snprintf()
snprintf(buf, sizeof(buf), "%06lu", static_cast<unsigned long>(t.toUSec() % 1000000L));
s << (t.toUSec() / 1000000L) << '.' << buf;
return s;
}
libuavcan/src/driver/uc_can.cpp
+1 -1
View File
@@ -59,7 +59,7 @@ bool CanFrame::priorityHigherThan(const CanFrame& rhs) const
std::string CanFrame::toString(StringRepresentation mode) const
{
using std::snprintf;
using namespace std; // For snprintf()
assert(mode == StrTight || mode == StrAligned);
libuavcan/src/transport/uc_frame.cpp
+7 -6
View File
@@ -197,6 +197,7 @@ bool Frame::operator==(const Frame& rhs) const
std::string Frame::toString() const
{
using namespace std; // For snprintf()
/*
* Frame ID fields, according to UAVCAN specs:
* - Data Type ID
@@ -208,19 +209,19 @@ std::string Frame::toString() const
*/
static const int BUFLEN = 100;
char buf[BUFLEN];
int ofs = std::snprintf(buf, BUFLEN, "dtid=%i tt=%i snid=%i dnid=%i idx=%i last=%i tid=%i payload=[",
int(data_type_id_.get()), int(transfer_type_), int(src_node_id_.get()),
int(dst_node_id_.get()), int(frame_index_), int(last_frame_), int(transfer_id_.get()));
int ofs = snprintf(buf, BUFLEN, "dtid=%i tt=%i snid=%i dnid=%i idx=%i last=%i tid=%i payload=[",
int(data_type_id_.get()), int(transfer_type_), int(src_node_id_.get()),
int(dst_node_id_.get()), int(frame_index_), int(last_frame_), int(transfer_id_.get()));
for (int i = 0; i < payload_len_; i++)
{
ofs += std::snprintf(buf + ofs, BUFLEN - ofs, "%02x", payload_[i]);
ofs += snprintf(buf + ofs, BUFLEN - ofs, "%02x", payload_[i]);
if ((i + 1) < payload_len_)
{
ofs += std::snprintf(buf + ofs, BUFLEN - ofs, " ");
ofs += snprintf(buf + ofs, BUFLEN - ofs, " ");
}
}
ofs += std::snprintf(buf + ofs, BUFLEN - ofs, "]");
ofs += snprintf(buf + ofs, BUFLEN - ofs, "]");
return std::string(buf);
}
libuavcan/src/transport/uc_transfer_buffer.cpp
+2 -1
View File
@@ -15,8 +15,9 @@ namespace uavcan
*/
std::string TransferBufferManagerKey::toString() const
{
using namespace std; // For snprintf()
char buf[24];
std::snprintf(buf, sizeof(buf), "nid=%i tt=%i", int(node_id_.get()), int(transfer_type_));
snprintf(buf, sizeof(buf), "nid=%i tt=%i", int(node_id_.get()), int(transfer_type_));
return std::string(buf);
}