From 8efb94d67c4fff40b6b3ef526f933001ab1fcf86 Mon Sep 17 00:00:00 2001
From: Andrea Zoli <zoli@iasfbo.inaf.it>
Date: Tue, 3 Mar 2015 16:36:02 +0100
Subject: [PATCH] Fix -Wextra warnings.
---
include/PacketLibDefinition.h | 9 +++++++++
include/SharedPtr.h | 2 +-
src/ByteStream.cpp | 2 ++
src/OutputSerial.cpp | 1 +
src/OutputSocketClient.cpp | 2 ++
src/Packet.cpp | 2 ++
src/PacketNotRecognized.cpp | 5 +++++
src/SDFBlock.cpp | 8 ++++----
8 files changed, 26 insertions(+), 5 deletions(-)
diff --git a/include/PacketLibDefinition.h b/include/PacketLibDefinition.h
index c802e69..591441a 100644
--- a/include/PacketLibDefinition.h
+++ b/include/PacketLibDefinition.h
@@ -82,6 +82,15 @@ typedef unsigned int dword;
#define CONFIG_MAXNUMBER_OFCONFIGILES 20000
#define CONFIG_MAXNUMBEROFLINES_OFCONFIGILES 100000
+/// utility function to ignore unused function parameters.
+#ifdef HAS_MOVE_SEMANTICS
+template <typename T>
+void UNUSED(T &&)
+{ }
+#else
+#define UNUSED(expr) do { (void)(expr); } while (0)
+#endif
+
/// typedef bool boolean;
using namespace std;
diff --git a/include/SharedPtr.h b/include/SharedPtr.h
index 07363d1..f9e6b53 100644
--- a/include/SharedPtr.h
+++ b/include/SharedPtr.h
@@ -32,7 +32,7 @@ class SharedPtr
SharedPtr() : p(0), c(0) {}
explicit SharedPtr(T* s) : p(s), c(new unsigned(1)) {}
- SharedPtr(void* null) : p(0), c(0) {}
+ SharedPtr(void*) : p(0), c(0) {}
SharedPtr(const SharedPtr& s) : p(s.p), c(s.c) { if(c) ++*c; }
diff --git a/src/ByteStream.cpp b/src/ByteStream.cpp
index ce95aac..491c52b 100644
--- a/src/ByteStream.cpp
+++ b/src/ByteStream.cpp
@@ -164,6 +164,8 @@ ByteStreamPtr PacketLib::ByteStream::compress(enum CompressionAlgorithms algorit
ByteStreamPtr PacketLib::ByteStream::decompress(enum CompressionAlgorithms algorithmType, byte compressionLevel, dword dmax) {
ByteStreamPtr b;
+ UNUSED(compressionLevel);
+
switch(algorithmType)
{
case NONE:
diff --git a/src/OutputSerial.cpp b/src/OutputSerial.cpp
index 8ae2157..8eac50f 100644
--- a/src/OutputSerial.cpp
+++ b/src/OutputSerial.cpp
@@ -79,6 +79,7 @@ bool OutputSerial::writeByteStream(ByteStreamPtr b) throw(PacketExceptionIO*)
bool OutputSerial::writeString(const char* str) throw(PacketExceptionIO*)
{
+ UNUSED(str);
/* if(!isclosed)
file->writeString(str);
else
diff --git a/src/OutputSocketClient.cpp b/src/OutputSocketClient.cpp
index 3195104..d347608 100644
--- a/src/OutputSocketClient.cpp
+++ b/src/OutputSocketClient.cpp
@@ -72,5 +72,7 @@ bool OutputSocketClient::writeByteStream(ByteStreamPtr b) throw(PacketExceptionI
bool OutputSocketClient::writeString(const char* str) throw(PacketExceptionIO*)
{
+ UNUSED(str);
+
throw new PacketExceptionIO("Method not implemented");
}
diff --git a/src/Packet.cpp b/src/Packet.cpp
index 1632a85..139d510 100644
--- a/src/Packet.cpp
+++ b/src/Packet.cpp
@@ -582,6 +582,8 @@ void Packet::generateStream()
bool Packet::setPacketValueVerify(ByteStreamPtr prefix, ByteStreamPtr packetHeader, ByteStreamPtr packetDataField)
{
+ UNUSED(prefix);
+
/// 1) Checking
/// First check: pointers control
if(packetHeader == NULL || packetDataField == NULL)
diff --git a/src/PacketNotRecognized.cpp b/src/PacketNotRecognized.cpp
index 6662f56..0e10516 100644
--- a/src/PacketNotRecognized.cpp
+++ b/src/PacketNotRecognized.cpp
@@ -30,6 +30,9 @@ void PacketNotRecognized::createPacketType(pugi::xml_node node, int plPhysicalIn
bool PacketNotRecognized::createPacketType(char* fileName, bool prefix, word dimprefix) throw (PacketException*)
{
+ UNUSED(prefix);
+ UNUSED(dimprefix);
+
packetID = 0;
if(header->loadHeader(fileName))
{
@@ -60,6 +63,8 @@ PacketNotRecognized::~PacketNotRecognized()
bool PacketNotRecognized::setPacketValue(ByteStreamPtr prefix, ByteStreamPtr packetHeader, ByteStreamPtr packetDataField, int decodeType)
{
+ UNUSED(decodeType);
+
/// It reads and sets the packet header
if(!header->setByteStream(packetHeader))
return false;
diff --git a/src/SDFBlock.cpp b/src/SDFBlock.cpp
index eb327b7..6e7b453 100644
--- a/src/SDFBlock.cpp
+++ b/src/SDFBlock.cpp
@@ -75,9 +75,9 @@ void SDFBlockType::loadType(pugi::xml_node node, const pugi::xml_document& doc,
std::cout << "fixed part: " << variablePresent;
std::cout << " variable part: " << variablePresent << std::endl;
#endif
- numberOfRBlocks = rbNodeSet.size();
- if(numberOfRBlocks > 65535)
+ if(rbNodeSet.size() > 65535)
throw new PacketExceptionFileFormat("Too many number of Rblocks in the packet type.");
+ numberOfRBlocks = rbNodeSet.size();
rblockFilename = new char*[numberOfRBlocks];
rBlockVariable = new bool[numberOfRBlocks];
maxNumberOfBlock = new word[numberOfRBlocks];
@@ -97,9 +97,9 @@ void SDFBlockType::loadType(pugi::xml_node node, const pugi::xml_document& doc,
rBlockVariable[i] = false;
const char* nblocks = rbNode.attribute("maxnumberofblocks").value();
- maxNumberOfBlock[i] = atoi(nblocks);
- if(maxNumberOfBlock[i] > 65535)
+ if(atoi(nblocks) > 65535)
throw new PacketExceptionFileFormat("Too many number of blocks in the packet type.");
+ maxNumberOfBlock[i] = atoi(nblocks);
if(!idref)
{
--
GitLab