diff options
| -rw-r--r-- | src/plugins/canbus/socketcan/socketcanbackend.cpp | 8 | ||||
| -rw-r--r-- | src/serialbus/qcanbusframe.h | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/plugins/canbus/socketcan/socketcanbackend.cpp b/src/plugins/canbus/socketcan/socketcanbackend.cpp index b994542..021c309 100644 --- a/src/plugins/canbus/socketcan/socketcanbackend.cpp +++ b/src/plugins/canbus/socketcan/socketcanbackend.cpp @@ -444,7 +444,7 @@ bool SocketCanBackend::writeFrame(const QCanBusFrame &newData) qint64 bytesWritten = 0; if (newData.hasFlexibleDataRateFormat()) { canfd_frame frame; - memset(&frame, 0, sizeof(frame)); + ::memset(&frame, 0, sizeof(frame)); frame.len = newData.payload().size(); frame.can_id = canId; frame.flags = newData.hasBitrateSwitch() ? CANFD_BRS : 0; @@ -454,7 +454,7 @@ bool SocketCanBackend::writeFrame(const QCanBusFrame &newData) bytesWritten = ::write(canSocket, &frame, sizeof(frame)); } else { can_frame frame; - memset(&frame, 0, sizeof(frame)); + ::memset(&frame, 0, sizeof(frame)); frame.can_dlc = newData.payload().size(); frame.can_id = canId; ::memcpy(frame.data, newData.payload().constData(), frame.can_dlc); @@ -641,7 +641,7 @@ void SocketCanBackend::readSocket() QVector<QCanBusFrame> newFrames; for (;;) { - memset(&m_frame, 0, sizeof(m_frame)); + ::memset(&m_frame, 0, sizeof(m_frame)); m_iov.iov_len = sizeof(m_frame); m_msg.msg_namelen = sizeof(m_addr); m_msg.msg_controllen = sizeof(m_ctrlmsg); @@ -665,7 +665,7 @@ void SocketCanBackend::readSocket() if (Q_UNLIKELY(ioctl(canSocket, SIOCGSTAMP, &timeStamp) < 0)) { setError(qt_error_string(errno), QCanBusDevice::CanBusError::ReadError); - memset(&timeStamp, 0, sizeof(timeStamp)); + ::memset(&timeStamp, 0, sizeof(timeStamp)); } const QCanBusFrame::TimeStamp stamp(timeStamp.tv_sec, timeStamp.tv_usec); diff --git a/src/serialbus/qcanbusframe.h b/src/serialbus/qcanbusframe.h index 7468816..0300a9c 100644 --- a/src/serialbus/qcanbusframe.h +++ b/src/serialbus/qcanbusframe.h @@ -82,7 +82,7 @@ public: reserved0(0x0) { Q_UNUSED(reserved0); - memset(reserved, 0, sizeof(reserved)); + ::memset(reserved, 0, sizeof(reserved)); setFrameId(0x0); setFrameType(type); } @@ -116,7 +116,7 @@ public: reserved0(0x0), load(data) { - memset(reserved, 0, sizeof(reserved)); + ::memset(reserved, 0, sizeof(reserved)); setFrameId(identifier); } |