sven
/
libicsneo
mirror of https://github.com/intrepidcs/libicsneo.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Quiet down warnings on Windows

checksum-failure-logging
Paul Hollinsky 2019-10-16 17:43:11 -04:00
parent debaf8f0cb
commit eb856dffec
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
communication/message/flexray/control/flexraycontrolmessage.cpp
View File

@ -1,5 +1,6 @@
#include <icsneo/communication/message/flexray/control/flexraycontrolmessage.h> #include <icsneo/communication/message/flexray/control/flexraycontrolmessage.h>
#include <cstring> // memcpy #include <cstring> // memcpy
#include <limits>
using namespace icsneo; using namespace icsneo;
@ -7,7 +8,7 @@ std::vector<uint8_t> FlexRayControlMessage::BuildBaseControlArgs(uint8_t control
std::vector<uint8_t> ret; std::vector<uint8_t> ret;
ret.reserve(args.size() + 4); ret.reserve(args.size() + 4);
ret.push_back(controller); ret.push_back(controller);
const uint16_t size = args.size() + 1; // Add 1 for the opcode const uint16_t size = uint16_t(std::min(args.size() + 1, size_t(std::numeric_limits<uint16_t>::max()))); // Add 1 for the opcode
ret.push_back(uint8_t(size)); ret.push_back(uint8_t(size));
ret.push_back(uint8_t(size >> 8)); ret.push_back(uint8_t(size >> 8));
ret.push_back(uint8_t(op)); ret.push_back(uint8_t(op));

4
communication/packet/flexraypacket.cpp
View File

@ -31,7 +31,7 @@ std::shared_ptr<FlexRayMessage> HardwareFlexRayPacket::DecodeToMessage(const std
} }
uint32_t numBytes = data->payload_len * 2; uint32_t numBytes = data->payload_len * 2;
if(ssize_t(numBytes) >= ssize_t(data->Length) - 4) { if(int64_t(numBytes) >= int64_t(data->Length) - 4) {
if(data->statusBits.bits.fcrc_error) if(data->statusBits.bits.fcrc_error)
msg->crcStatus = FlexRay::CRCStatus::Error; msg->crcStatus = FlexRay::CRCStatus::Error;
} else { } else {
@ -47,7 +47,7 @@ std::shared_ptr<FlexRayMessage> HardwareFlexRayPacket::DecodeToMessage(const std
msg->sync = data->sync; msg->sync = data->sync;
msg->startup = data->startup; msg->startup = data->startup;
msg->id = data->id; msg->id = data->id;
if(ssize_t(numBytes) != ssize_t(data->Length) - 4) { if(int64_t(numBytes) != int64_t(data->Length) - 4) {
} else { } else {
// This is an error, probably need to flag it // This is an error, probably need to flag it

2
include/icsneo/device/device.h
View File

@ -86,7 +86,7 @@ public:
virtual size_t getNetworkCountByType(Network::Type) const; virtual size_t getNetworkCountByType(Network::Type) const;
virtual Network getNetworkByNumber(Network::Type, size_t) const; virtual Network getNetworkByNumber(Network::Type, size_t) const;
virtual std::shared_ptr<FlexRay::Controller> getFlexRayControllerByNetwork(const Network& net) const { return nullptr; } virtual std::shared_ptr<FlexRay::Controller> getFlexRayControllerByNetwork(const Network&) const { return nullptr; }
const device_eventhandler_t& getEventHandler() const { return report; } const device_eventhandler_t& getEventHandler() const { return report; }

2
include/icsneo/device/extensions/deviceextension.h
View File

@ -14,7 +14,7 @@ public:
DeviceExtension(Device& device) : device(device) {} DeviceExtension(Device& device) : device(device) {}
virtual ~DeviceExtension() = default; virtual ~DeviceExtension() = default;
virtual const char* getName() const = 0; virtual const char* getName() const = 0;
virtual void handleMessage(const std::shared_ptr<Message>& message) {} virtual void handleMessage(const std::shared_ptr<Message>&) {}
protected: protected:
Device& device; Device& device;