1 files changed, 8 insertions, 15 deletions
diff --git a/src/plugins/canbus/peakcan/peakcanbackend.cpp b/src/plugins/canbus/peakcan/peakcanbackend.cpp
index 5a17b22..6e1af1c 100644
--- a/src/plugins/canbus/peakcan/peakcanbackend.cpp
+++ b/src/plugins/canbus/peakcan/peakcanbackend.cpp
@@ -344,7 +344,7 @@ bool PeakCanBackendPrivate::open()
     if (readHandle == INVALID_HANDLE_VALUE) {
         readHandle = ::CreateEvent(nullptr, FALSE, FALSE, nullptr);
         if (Q_UNLIKELY(!readHandle)) {
-            const QString errorString = qt_error_string(::GetLastError());
+            const QString errorString = qt_error_string(int(::GetLastError()));
             qCCritical(QT_CANBUS_PLUGINS_PEAKCAN, "Cannot create receive event handler: %ls",
                        qUtf16Printable(errorString));
             q->setError(errorString, QCanBusDevice::ConnectionError);
@@ -404,7 +404,7 @@ void PeakCanBackendPrivate::close()
 
 #if defined(Q_OS_WIN32)
     if (readHandle && (readHandle != INVALID_HANDLE_VALUE)) {
-        const QString errorString = qt_error_string(::GetLastError());
+        const QString errorString = qt_error_string(int(::GetLastError()));
         if (Q_UNLIKELY(!::CloseHandle(readHandle))) {
             qCCritical(QT_CANBUS_PLUGINS_PEAKCAN, "Cannot close read handle: %ls",
                        qUtf16Printable(errorString));
@@ -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) {