From 1be24b78cc3c939acba2f1c00572de4307983229 Mon Sep 17 00:00:00 2001
From: Andrea Bulgarelli <bulgarelli@iasfbo.inaf.it>
Date: Tue, 8 Oct 2013 16:39:58 +0200
Subject: [PATCH] PartOfPacket::loadFields() do-while, unit test

---
 ChangeLog            | 5 +++++
 Makefile             | 2 +-
 src/Packet.cpp       | 4 +---
 src/PacketHeader.cpp | 2 +-
 src/PartOfPacket.cpp | 7 ++-----
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9768f42..6d2e864 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-10-08  Andrea Bulgarelli <bulgarelli@iasfbo.inaf.it>
+
+* src/PartOfPacket.cpp (PartOfPacket::loadFields): inserted do-while
+* src/PacketHeader.cpp (PacketHeader::~PacketHeader): removed delete name
+
 2013-09-19  Andrea Bulgarelli <bulgarelli@iasfbo.inaf.it>
 
 * src/Packet.cpp (Packet::setPacketValue): bug correction
diff --git a/Makefile b/Makefile
index ec0a4a4..01a571b 100644
--- a/Makefile
+++ b/Makefile
@@ -78,7 +78,7 @@ ifeq ($(SYSTEM), QNX)
 endif
 ifneq (, $(findstring apple, $(SYSTEM)))
  	# Do apple things
-	CPPFLAGS += -I$(LOCAL)/include/cppunit
+	CPPFLAGS += -I$(LOCAL)/include
 	LIBS += -L$(LOCAL)/lib
 endif 
 
diff --git a/src/Packet.cpp b/src/Packet.cpp
index 35be4d2..2b13795 100644
--- a/src/Packet.cpp
+++ b/src/Packet.cpp
@@ -54,8 +54,6 @@ Packet::~Packet()
     header = 0;
     delete dataField;
     dataField = 0;
-    delete[] name;
-    name = 0;
     for(unsigned i = 0; i < number_of_identifier; i++)
         delete identifiers[i];
     delete[] identifiers;
@@ -65,7 +63,7 @@ Packet::~Packet()
     tempHeader = 0;
     delete tempDataField;
     tempDataField = 0;
-    //ANDREA: ricordato di indagare perch�non si riesce ad effettuare il delete
+    //ANDREA: ricordato di indagare perche' non si riesce ad effettuare il delete
     delete tempDataFieldHeader;
     tempDataFieldHeader = 0;
     delete tempPacketDataField;
diff --git a/src/PacketHeader.cpp b/src/PacketHeader.cpp
index 5266a40..7a5d9a8 100644
--- a/src/PacketHeader.cpp
+++ b/src/PacketHeader.cpp
@@ -31,7 +31,7 @@ PacketHeader::PacketHeader() : PartOfPacket("Packet Header")
 
 PacketHeader::~PacketHeader()
 {
-    delete[] name;
+
 }
 
 
diff --git a/src/PartOfPacket.cpp b/src/PartOfPacket.cpp
index 4d16343..e2db068 100644
--- a/src/PartOfPacket.cpp
+++ b/src/PartOfPacket.cpp
@@ -90,10 +90,7 @@ bool PartOfPacket::loadFields(InputText& fp) throw(PacketException*)
     int count = 0;
     /// count the number of fields
     long pos = fp.getpos();
-    name = fp.getLine();
-    count++;
-    while(strlen(name) !=  0)
-    {
+    do {
         name = fp.getLine();
         count++;
         if(name[0] == '[')
@@ -101,7 +98,7 @@ bool PartOfPacket::loadFields(InputText& fp) throw(PacketException*)
             count--;
             break;
         }
-    }
+    } while(strlen(name) !=  0);
     fp.setpos(pos);
     fields = new Field* [count/3];
 
-- 
GitLab