Commit 1be24b78 authored by Andrea Bulgarelli's avatar Andrea Bulgarelli
Browse files

PartOfPacket::loadFields() do-while, unit test

parent 2ea67c87

ChangeLog

+5 −0
Original line number Diff line number Diff line 
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

Makefile

+1 −1
Original line number Diff line number Diff line
@@ -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

src/Packet.cpp

+1 −3
Original line number Diff line number Diff line
@@ -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;

src/PacketHeader.cpp

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ PacketHeader::PacketHeader() : PartOfPacket("Packet Header") 


PacketHeader::~PacketHeader()

{

    delete[] name;



}

src/PartOfPacket.cpp

+2 −5
Original line number Diff line number Diff line
@@ -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];