summaryrefslogtreecommitdiffstats
path: root/src/plugins/canbus/socketcan
diff options
context:
space:
mode:
authorAndre Hartmann <aha_1980@gmx.de>2017-05-14 16:36:09 +0200
committerAndré Hartmann <aha_1980@gmx.de>2017-07-05 07:31:43 +0000
commit88899fddedda325e7f9a7a134827c9387ef8a383 (patch)
treebf9ff3aa86b8b0616fc33063a3212f56d6d75f13 /src/plugins/canbus/socketcan
parenta258db4c7854052132a8f443404a524af2d5a36e (diff)
CAN: Use memset from root namespace
Most other code places already do it this way. Change-Id: Id1a2e262eae0bf46f6f42266c6cc57b92505ff1d Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com> Reviewed-by: Rolf Eike Beer <eb@emlix.com> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Diffstat (limited to 'src/plugins/canbus/socketcan')
-rw-r--r--src/plugins/canbus/socketcan/socketcanbackend.cpp8
1 files changed, 4 insertions, 4 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);