Skip to content
Snippets Groups Projects
Commit a149eabf authored by Andrea Zoli's avatar Andrea Zoli
Browse files

Fix compiler warnings.

parent b67d81a8
No related branches found
No related tags found
No related merge requests found
...@@ -71,7 +71,7 @@ public: ...@@ -71,7 +71,7 @@ public:
virtual void close( ) throw(PacketExceptionIO*); virtual void close( ) throw(PacketExceptionIO*);
/// \return true if file is closed, false if file is opened. /// \return true if file is closed, false if file is opened.
virtual bool isClosed(); virtual bool isClosed() const;
/// \return Returns last line read from file. /// \return Returns last line read from file.
char* getLastLineRead(); char* getLastLineRead();
...@@ -93,7 +93,7 @@ public: ...@@ -93,7 +93,7 @@ public:
virtual bool setLastBookmarkPos(); virtual bool setLastBookmarkPos();
/// \return Returns true is the position into file is at end of file /// \return Returns true is the position into file is at end of file
virtual bool isEOF(); virtual bool isEOF() const;
/// \pre The file must be opened. /// \pre The file must be opened.
long setFirstPos() throw(PacketExceptionIO*); long setFirstPos() throw(PacketExceptionIO*);
......
...@@ -37,7 +37,7 @@ public: ...@@ -37,7 +37,7 @@ public:
virtual void close() throw(PacketExceptionIO*); virtual void close() throw(PacketExceptionIO*);
virtual ByteStreamPtr readByteStream(int n_byte) throw(PacketExceptionIO*); virtual ByteStreamPtr readByteStream(dword n_byte) throw(PacketExceptionIO*);
virtual char* readString() throw(PacketExceptionIO*); virtual char* readString() throw(PacketExceptionIO*);
......
...@@ -88,8 +88,6 @@ private: ...@@ -88,8 +88,6 @@ private:
dword indexread; dword indexread;
char* currentpwd;
char* bufferName; char* bufferName;
bool eof; bool eof;
......
...@@ -356,8 +356,6 @@ private: ...@@ -356,8 +356,6 @@ private:
bool decodedPacketTail; bool decodedPacketTail;
bool iscompressed;
int compressionAlgorithmsSection; int compressionAlgorithmsSection;
int compressionAlgorithmsIndex; int compressionAlgorithmsIndex;
......
...@@ -44,7 +44,7 @@ public: ...@@ -44,7 +44,7 @@ public:
dword sizeMax(); dword sizeMax();
/// Creates the outputstream ByteStream for the generation of the output stream /// Creates the outputstream ByteStream for the generation of the output stream
virtual bool setOutputStream(ByteStreamPtr os, word first); virtual bool setOutputStream(ByteStreamPtr os, dword first);
virtual ByteStreamPtr generateStream(bool bigendian); virtual ByteStreamPtr generateStream(bool bigendian);
......
...@@ -35,7 +35,7 @@ public: ...@@ -35,7 +35,7 @@ public:
virtual bool createPacketType(char* fileName, bool prefix, word dimprefix) throw (PacketException*); virtual bool createPacketType(char* fileName, bool prefix, word dimprefix) throw (PacketException*);
virtual bool setPacketValue(ByteStreamPtr prefix, ByteStreamPtr packetHeader, ByteStreamPtr packetDataField); virtual bool setPacketValue(ByteStreamPtr prefix, ByteStreamPtr packetHeader, ByteStreamPtr packetDataField, int decodeType);
}; };
} }
......
...@@ -150,6 +150,8 @@ public: ...@@ -150,6 +150,8 @@ public:
virtual ByteStreamPtr generateStream(bool bigendian); virtual ByteStreamPtr generateStream(bool bigendian);
using PartOfPacket::setByteStream;
virtual bool setByteStream(ByteStreamPtr s, int decodeType); virtual bool setByteStream(ByteStreamPtr s, int decodeType);
virtual ByteStreamPtr getByteStream() virtual ByteStreamPtr getByteStream()
...@@ -384,7 +386,7 @@ public: ...@@ -384,7 +386,7 @@ public:
virtual word getTotalNumberOfFields(); virtual word getTotalNumberOfFields();
/// Prints the value of each field of this part of packet /// Prints the value of each field of this part of packet
virtual char** printValue(char* addString = ""); virtual char** printValue(const char* addString = "");
virtual void printValueStdout(); virtual void printValueStdout();
......
...@@ -221,6 +221,8 @@ public: ...@@ -221,6 +221,8 @@ public:
virtual dword sizeFixedPart(); virtual dword sizeFixedPart();
using PartOfPacket::setByteStream;
//onlySections = false //onlySections = false
virtual bool setByteStream(ByteStreamPtr s, int decodeType); virtual bool setByteStream(ByteStreamPtr s, int decodeType);
...@@ -243,7 +245,7 @@ public: ...@@ -243,7 +245,7 @@ public:
/// Prints the value of each field of this part of packet /// Prints the value of each field of this part of packet
virtual char** printValue(char* addString = ""); virtual char** printValue(const char* addString = "");
virtual void printValueStdout(); virtual void printValueStdout();
......
...@@ -73,7 +73,7 @@ PacketLib::ByteStream::ByteStream(byte* stream, dword dim, bool bigendian, bool ...@@ -73,7 +73,7 @@ PacketLib::ByteStream::ByteStream(byte* stream, dword dim, bool bigendian, bool
PacketLib::ByteStream::ByteStream(ByteStreamPtr b0, dword start, dword end, bool memory_sharing) { PacketLib::ByteStream::ByteStream(ByteStreamPtr b0, dword start, dword end, bool memory_sharing) {
mem_allocation_constructor = true; mem_allocation_constructor = true;
if(end == -1) if(end == (dword)-1)
end = b0->size(); end = b0->size();
byteInTheStream = end-start; byteInTheStream = end-start;
......
...@@ -52,7 +52,7 @@ bool ConfigurationFile::open(char** parameters) throw(PacketExceptionIO*) ...@@ -52,7 +52,7 @@ bool ConfigurationFile::open(char** parameters) throw(PacketExceptionIO*)
XmlConfig config; XmlConfig config;
std::string streamfile = confdir + config.convert(parameters[0]); std::string streamfile = confdir + config.convert(parameters[0]);
int size = streamfile.size(); int size = streamfile.size();
parameters[0] = new char[size]; parameters[0] = new char[size+1];
memcpy(parameters[0], streamfile.c_str(), size); memcpy(parameters[0], streamfile.c_str(), size);
parameters[0][size] = 0; parameters[0][size] = 0;
chdir(currentpwd); chdir(currentpwd);
......
...@@ -188,7 +188,7 @@ void File::close( ) throw(PacketExceptionIO*) ...@@ -188,7 +188,7 @@ void File::close( ) throw(PacketExceptionIO*)
} }
bool File::isClosed() bool File::isClosed() const
{ {
return closed; return closed;
} }
...@@ -240,7 +240,7 @@ bool File::setLastBookmarkPos() ...@@ -240,7 +240,7 @@ bool File::setLastBookmarkPos()
bool File::isEOF() bool File::isEOF() const
{ {
if(!closed) if(!closed)
return eof; return eof;
......
...@@ -56,12 +56,12 @@ void InputSerial::close() throw(PacketExceptionIO*) ...@@ -56,12 +56,12 @@ void InputSerial::close() throw(PacketExceptionIO*)
ByteStreamPtr InputSerial::readByteStream(int n_byte) throw(PacketExceptionIO*) ByteStreamPtr InputSerial::readByteStream(dword n_byte) throw(PacketExceptionIO*)
{ {
//cout << "waiting " << n_byte << endl; //cout << "waiting " << n_byte << endl;
ByteStreamPtr bs; ByteStreamPtr bs;
byte* buff = new byte[n_byte]; byte* buff = new byte[n_byte];
int current = 0; dword current = 0;
if(!closed) if(!closed)
{ {
while(current != n_byte) while(current != n_byte)
......
...@@ -24,6 +24,7 @@ using namespace PacketLib; ...@@ -24,6 +24,7 @@ using namespace PacketLib;
#define DECODETYPE 2 #define DECODETYPE 2
Packet::Packet(bool bigendian) Packet::Packet(bool bigendian)
: decodedPacketDataFieldHeader(false)
{ {
header = (PacketHeader*) new PacketHeader(); header = (PacketHeader*) new PacketHeader();
dataField = (PacketDataField*) new PacketDataField(); dataField = (PacketDataField*) new PacketDataField();
...@@ -101,7 +102,6 @@ bool Packet::createPacketType(char* fileName, bool isprefix, word dimprefix) thr ...@@ -101,7 +102,6 @@ bool Packet::createPacketType(char* fileName, bool isprefix, word dimprefix) thr
dimPacketDataFieldHeader = dataField->getPacketDataFieldHeader()->size(); dimPacketDataFieldHeader = dataField->getPacketDataFieldHeader()->size();
//cout << (dataField->dataFieldHeader->printStructure())->c_str(); //cout << (dataField->dataFieldHeader->printStructure())->c_str();
line=file.getLastLineRead(); line=file.getLastLineRead();
char *typeOfPacket = 0;
if(strcmp(line, "[SourceDataField]") == 0) if(strcmp(line, "[SourceDataField]") == 0)
{ {
/// determination of the source data field type /// determination of the source data field type
...@@ -518,7 +518,7 @@ bool Packet::setPacketValueSourceDataField(ByteStreamPtr packetDataField, int de ...@@ -518,7 +518,7 @@ bool Packet::setPacketValueSourceDataField(ByteStreamPtr packetDataField, int de
dword nrd = dataField->getNumberOfRealDataBlock(); dword nrd = dataField->getNumberOfRealDataBlock();
dataField->sourceDataField->setNumberOfBlocks(nrd); dataField->sourceDataField->setNumberOfBlocks(nrd);
} }
/ */
/*if(dataField->sourceDataField->isRBlock()) { /*if(dataField->sourceDataField->isRBlock()) {
word nrd = dataField->sourceDataField->getNumberOfRealDataBlock(); word nrd = dataField->sourceDataField->getNumberOfRealDataBlock();
dataField->sourceDataField->setNumberOfBlocks(nrd); dataField->sourceDataField->setNumberOfBlocks(nrd);
...@@ -615,7 +615,7 @@ ByteStreamPtr Packet::encodeAndSetData(ByteStreamPtr sourceDataVariable) ...@@ -615,7 +615,7 @@ ByteStreamPtr Packet::encodeAndSetData(ByteStreamPtr sourceDataVariable)
if(sourceDataVariable->size() != size() - dimPacketStartingFixedPart - dimPacketTail) if(sourceDataVariable->size() != size() - dimPacketStartingFixedPart - dimPacketTail)
throw new PacketException("the size of the sourceDataVariable is wrong"); throw new PacketException("the size of the sourceDataVariable is wrong");
bool swapped = false; bool swapped = false;
if(!ARCH_BIGENDIAN && bigendian || ARCH_BIGENDIAN && !bigendian) { if((!ARCH_BIGENDIAN && bigendian) || (ARCH_BIGENDIAN && !bigendian)) {
sourceDataVariable->swapWord(); sourceDataVariable->swapWord();
swapped = true; swapped = true;
} }
......
...@@ -61,7 +61,7 @@ dword PacketDataField::sizeMax() ...@@ -61,7 +61,7 @@ dword PacketDataField::sizeMax()
bool PacketDataField::setOutputStream(ByteStreamPtr os, word first) bool PacketDataField::setOutputStream(ByteStreamPtr os, dword first)
{ {
outputstream = ByteStreamPtr(new ByteStream((os->stream + first), size(), os->isBigendian())); outputstream = ByteStreamPtr(new ByteStream((os->stream + first), size(), os->isBigendian()));
dataFieldHeader->setOutputStream(os, first); dataFieldHeader->setOutputStream(os, first);
......
...@@ -73,7 +73,7 @@ PacketNotRecognized::~PacketNotRecognized() ...@@ -73,7 +73,7 @@ PacketNotRecognized::~PacketNotRecognized()
bool PacketNotRecognized::setPacketValue(ByteStreamPtr prefix, ByteStreamPtr packetHeader, ByteStreamPtr packetDataField) bool PacketNotRecognized::setPacketValue(ByteStreamPtr prefix, ByteStreamPtr packetHeader, ByteStreamPtr packetDataField, int decodeType)
{ {
/// It reads and sets the packet header /// It reads and sets the packet header
if(!header->setByteStream(packetHeader)) if(!header->setByteStream(packetHeader))
......
...@@ -570,7 +570,7 @@ bool SDFBlock::setByteStream(ByteStreamPtr s, int decodeType) ...@@ -570,7 +570,7 @@ bool SDFBlock::setByteStream(ByteStreamPtr s, int decodeType)
} }
char** SDFBlock::printValue(char* addString) char** SDFBlock::printValue(const char* addString)
{ {
char** cc; char** cc;
char** ct; char** ct;
...@@ -610,7 +610,7 @@ char** SDFBlock::printValue(char* addString) ...@@ -610,7 +610,7 @@ char** SDFBlock::printValue(char* addString)
i += type->maxNumberOfBlock[rbi] - getNumberOfBlocks(rbi) - 1; i += type->maxNumberOfBlock[rbi] - getNumberOfBlocks(rbi) - 1;
} }
} }
cc[index] = '\0'; cc[index] = 0;
return cc; return cc;
} }
......
...@@ -198,7 +198,7 @@ word SourceDataField::getNumberOfFields() ...@@ -198,7 +198,7 @@ word SourceDataField::getNumberOfFields()
return block[0].getNumberOfFields(); return block[0].getNumberOfFields();
} }
char** SourceDataField::printValue(char* addString) char** SourceDataField::printValue(const char* addString)
{ {
return block[0].printValue(addString); return block[0].printValue(addString);
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment