From 37ec0819d837d95587ab3b9ca6ee3ce82576f45e Mon Sep 17 00:00:00 2001 From: Andrea Bulgarelli Date: Fri, 20 Sep 2013 11:36:01 +0200 Subject: [PATCH] Packet::setPacketValue): bug correction --- ChangeLog | 9 +++++++-- Makefile | 2 +- include/PacketHeader.h | 6 +++--- src/Packet.cpp | 4 ++-- src/PacketHeader.cpp | 12 ++++++------ 5 files changed, 19 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index ff76b3a..9768f42 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,11 @@ -2013-09-18 bulgarelli Andrea Bulgarelli +2013-09-19 Andrea Bulgarelli - * src/Packet.cpp (Packet::createPacketType): bool Packet::createPacketType(char* fileName, bool isprefix, word dimprefix) bug fix when the configuration files are read more than one time +* src/Packet.cpp (Packet::setPacketValue): bug correction +* include/PacketHeader.h (PacketHeader.getDimensionOfPacketLength): renamed the method for typo + +2013-09-18 Andrea Bulgarelli + +* src/Packet.cpp (Packet::createPacketType): bool Packet::createPacketType(char* fileName, bool isprefix, word dimprefix) bug fix when the configuration files are read more than one time 2013-09-17 Andrea Bulgarelli diff --git a/Makefile b/Makefile index 5692e33..dfc6021 100644 --- a/Makefile +++ b/Makefile @@ -60,7 +60,7 @@ CC = gcc CXX = g++ #Insert the optional parameter to the compiler. The CFLAGS could be changed externally by the user #- g3 -CFLAGS = -O2 -O0 -m64 -fPIC +CFLAGS = -O2 -O0 -m64 -fPIC #-O2 -O0 -g3 #Set INCPATH to add the inclusion paths INCPATH = -I ./include diff --git a/include/PacketHeader.h b/include/PacketHeader.h index 6e2aba3..2e2177a 100644 --- a/include/PacketHeader.h +++ b/include/PacketHeader.h @@ -50,9 +50,9 @@ public: Field * getFieldWithPacketDimension(); - inline word getDimensionOfPacketLenght() + inline word getDimensionOfPacketLength() { - return dimensionOfPacketLenght; + return dimensionOfPacketLength; }; private: @@ -64,7 +64,7 @@ private: word numberOfFieldWithPacketDimension; /// 16 or 32 bit - word dimensionOfPacketLenght; + word dimensionOfPacketLength; }; diff --git a/src/Packet.cpp b/src/Packet.cpp index 16652eb..35be4d2 100644 --- a/src/Packet.cpp +++ b/src/Packet.cpp @@ -850,7 +850,7 @@ bool Packet::verifyPacketValue(byte* stream) { dim += dimHeader; tempHeader->setStream(stream+dimPre, dimHeader, bigendian); header->setByteStream(tempHeader); - dim += header->getDimensionOfPacketLenght() + 1; + dim += header->getDimensionOfPacketLength() + 1; ByteStream* packet = new ByteStream(stream+dimPre, dim, bigendian); return verifyPacketValue(prefix, packet); @@ -867,7 +867,7 @@ bool Packet::setPacketValue(byte* stream) { dim += dimHeader; tempHeader->setStream(stream+dimPre, dimHeader, bigendian); header->setByteStream(tempHeader); - dim += header->getDimensionOfPacketLenght() + 1; + dim += header->getPacketLength() + 1; ByteStream* packet = new ByteStream(stream+dimPre, dim, bigendian); return setPacketValue(prefix, packet); diff --git a/src/PacketHeader.cpp b/src/PacketHeader.cpp index e74ccc6..5266a40 100644 --- a/src/PacketHeader.cpp +++ b/src/PacketHeader.cpp @@ -25,7 +25,7 @@ using namespace PacketLib; PacketHeader::PacketHeader() : PartOfPacket("Packet Header") { name = 0; - dimensionOfPacketLenght = 16; + dimensionOfPacketLength = 16; } @@ -54,11 +54,11 @@ bool PacketHeader::loadHeader(char* fileName) throw(PacketException*) line = header.getLine(); if(strcmp(line, "[Field]") == 0) - dimensionOfPacketLenght = 16; + dimensionOfPacketLength = 16; else - dimensionOfPacketLenght = atoi(line); + dimensionOfPacketLength = atoi(line); - if(!(dimensionOfPacketLenght == 16 || dimensionOfPacketLenght == 32)) + if(!(dimensionOfPacketLength == 16 || dimensionOfPacketLength == 32)) throw new PacketExceptionIO("Dimension of packet length, 16 or 32 bit");; header.setpos(0); @@ -87,7 +87,7 @@ bool PacketHeader::loadHeader(char* fileName) throw(PacketException*) dword PacketHeader::getPacketLength() { - if(dimensionOfPacketLenght == 16) + if(dimensionOfPacketLength == 16) { Field* f = getFields(numberOfFieldWithPacketDimension); /// ESA standard: in the packet length the value 1 must be added @@ -101,7 +101,7 @@ dword PacketHeader::getPacketLength() void PacketHeader::setPacketLength(dword dim) { - if(dimensionOfPacketLenght == 16) + if(dimensionOfPacketLength == 16) { Field* f = getFields(numberOfFieldWithPacketDimension); /// ESA standard: in the packet length the value 1 must be added -- GitLab