From a3aa54e27094b80feae4e42c5f7e22c3d4022b49 Mon Sep 17 00:00:00 2001
From: Andre Hartmann <aha_1980@gmx.de>
Date: Wed, 19 Feb 2020 13:03:28 +0100
Subject: PeakCAN: Init API structs without memset

Change-Id: I1efaf60109d17a370662ca2b57c20ac76a9fe523
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
---
 src/plugins/canbus/peakcan/peakcanbackend.cpp | 19 ++++++-------------
 1 file 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(&timestamp, 0, sizeof(timestamp));
+            TPCANMsgFD message = {};
+            TPCANTimestampFD timestamp = {};
 
             const TPCANStatus st = ::CAN_ReadFD(channelIndex, &message, &timestamp);
             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(&timestamp, 0, sizeof(timestamp));
+            TPCANMsg message = {};
+            TPCANTimestamp timestamp = {};
 
             const TPCANStatus st = ::CAN_Read(channelIndex, &message, &timestamp);
             if (st != PCAN_ERROR_OK) {
-- 
cgit v1.2.3