diff options
author | Andre Hartmann <aha_1980@gmx.de> | 2020-02-19 13:03:28 +0100 |
---|---|---|
committer | Andre Hartmann <aha_1980@gmx.de> | 2020-02-19 13:55:27 +0100 |
commit | a3aa54e27094b80feae4e42c5f7e22c3d4022b49 (patch) | |
tree | f6aaef679aa2422e6b4d0f3f9479041405bf5801 | |
parent | 421dad73cc993f2af4573a709607690feb28729b (diff) |
PeakCAN: Init API structs without memsetv5.15.0-beta1
Change-Id: I1efaf60109d17a370662ca2b57c20ac76a9fe523
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
-rw-r--r-- | src/plugins/canbus/peakcan/peakcanbackend.cpp | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/src/plugins/canbus/peakcan/peakcanbackend.cpp b/src/plugins/canbus/peakcan/peakcanbackend.cpp index 5a17b22..d96ca4e 100644 --- a/src/plugins/canbus/peakcan/peakcanbackend.cpp +++ b/src/plugins/canbus/peakcan/peakcanbackend.cpp @@ -561,8 +561,7 @@ void PeakCanBackendPrivate::startWrite() if (isFlexibleDatarateEnabled) { const int size = payload.size(); - TPCANMsgFD message; - ::memset(&message, 0, sizeof(message)); + TPCANMsgFD message = {}; message.ID = frame.frameId(); message.DLC = sizeToDlc(size); message.MSGTYPE = frame.hasExtendedFrameFormat() ? PCAN_MESSAGE_EXTENDED @@ -583,9 +582,7 @@ void PeakCanBackendPrivate::startWrite() qCWarning(QT_CANBUS_PLUGINS_PEAKCAN(), errorString); q->setError(PeakCanBackend::tr(errorString), QCanBusDevice::WriteError); } else { - TPCANMsg message; - ::memset(&message, 0, sizeof(message)); - + TPCANMsg message = {}; message.ID = frame.frameId(); message.LEN = static_cast<quint8>(payload.size()); message.MSGTYPE = frame.hasExtendedFrameFormat() ? PCAN_MESSAGE_EXTENDED @@ -619,10 +616,8 @@ void PeakCanBackendPrivate::startRead() for (;;) { if (isFlexibleDatarateEnabled) { - TPCANMsgFD message; - ::memset(&message, 0, sizeof(message)); - TPCANTimestampFD timestamp; - ::memset(×tamp, 0, sizeof(timestamp)); + TPCANMsgFD message = {}; + TPCANTimestampFD timestamp = {}; const TPCANStatus st = ::CAN_ReadFD(channelIndex, &message, ×tamp); if (st != PCAN_ERROR_OK) { @@ -649,10 +644,8 @@ void PeakCanBackendPrivate::startRead() newFrames.append(std::move(frame)); } else { - TPCANMsg message; - ::memset(&message, 0, sizeof(message)); - TPCANTimestamp timestamp; - ::memset(×tamp, 0, sizeof(timestamp)); + TPCANMsg message = {}; + TPCANTimestamp timestamp = {}; const TPCANStatus st = ::CAN_Read(channelIndex, &message, ×tamp); if (st != PCAN_ERROR_OK) { |