summaryrefslogtreecommitdiffstats
path: root/src/plugins/canbus/socketcan/socketcanbackend.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/canbus/socketcan/socketcanbackend.cpp')
-rw-r--r--src/plugins/canbus/socketcan/socketcanbackend.cpp12
1 files changed, 4 insertions, 8 deletions
diff --git a/src/plugins/canbus/socketcan/socketcanbackend.cpp b/src/plugins/canbus/socketcan/socketcanbackend.cpp
index 60f36f9..c9781d1 100644
--- a/src/plugins/canbus/socketcan/socketcanbackend.cpp
+++ b/src/plugins/canbus/socketcan/socketcanbackend.cpp
@@ -594,14 +594,10 @@ void SocketCanBackend::readSocket()
if (ioctl(canSocket, SIOCGSTAMP, &timeStamp) < 0) {
setError(qt_error_string(errno),
QCanBusDevice::CanBusError::ReadError);
- timeStamp.tv_sec = 0;
- timeStamp.tv_usec = 0;
+ memset(&timeStamp, 0, sizeof(timeStamp));
}
- QCanBusFrame::TimeStamp stamp;
- stamp.setSeconds(timeStamp.tv_sec);
- stamp.setMicroSeconds(timeStamp.tv_usec);
-
+ const QCanBusFrame::TimeStamp stamp(timeStamp.tv_sec, timeStamp.tv_usec);
QCanBusFrame bufferedFrame;
bufferedFrame.setTimeStamp(stamp);
@@ -615,10 +611,10 @@ void SocketCanBackend::readSocket()
bufferedFrame.setFrameId(frame.can_id & CAN_EFF_MASK);
- QByteArray load(reinterpret_cast<char *>(frame.data), frame.len);
+ const QByteArray load(reinterpret_cast<char *>(frame.data), frame.len);
bufferedFrame.setPayload(load);
- newFrames.append(bufferedFrame);
+ newFrames.append(std::move(bufferedFrame));
}
enqueueReceivedFrames(newFrames);