diff --git a/MAC/APL/CURTDBDaemons/src/KeyValueLogger/KeyValueLogger.cc b/MAC/APL/CURTDBDaemons/src/KeyValueLogger/KeyValueLogger.cc index 96337bed91b4bc585ff4880ea69685eac0795795..69f20c8976ae4d4b1065f9ff247b4c3b451aa50c 100644 --- a/MAC/APL/CURTDBDaemons/src/KeyValueLogger/KeyValueLogger.cc +++ b/MAC/APL/CURTDBDaemons/src/KeyValueLogger/KeyValueLogger.cc @@ -191,11 +191,10 @@ GCFEvent::TResult KeyValueLogger::operational(GCFEvent& event, GCFPortInterface LOG_DEBUG_STR("operational:" << eventName(event) << "@" << port.getName()); GCFEvent::TResult status = GCFEvent::HANDLED; - static unsigned long garbageTimerID = 0; switch (event.signal) { case F_ENTRY: - garbageTimerID = itsTimerPort->setTimer(1.0, 5.0); + itsTimerPort->setTimer(1.0, 5.0); break; // Catch incoming connections of new clients diff --git a/MAC/APL/CURTDBDaemons/src/LogProcessor/LogProcessor.cc b/MAC/APL/CURTDBDaemons/src/LogProcessor/LogProcessor.cc index 08a5972dc1462cfcb420e415c7c863678cf76e21..82d4c0951e05fdc1fbcaee451aa6772c78e6ce4a 100644 --- a/MAC/APL/CURTDBDaemons/src/LogProcessor/LogProcessor.cc +++ b/MAC/APL/CURTDBDaemons/src/LogProcessor/LogProcessor.cc @@ -155,11 +155,10 @@ GCFEvent::TResult LogProcessor::operational(GCFEvent& event, LOG_DEBUG_STR("operational:" << eventName(event) << "@" << port.getName()); GCFEvent::TResult status = GCFEvent::HANDLED; - static unsigned long garbageTimerID = 0; switch (event.signal) { case F_ENTRY: - garbageTimerID = itsTimerPort->setTimer(1.0, 5.0); + itsTimerPort->setTimer(1.0, 5.0); // Register my own logging too. LOG_INFO("MACProcessScope: LOFAR_PermSW_Daemons_LogProcessor"); @@ -310,7 +309,7 @@ GCFEvent::TResult LogProcessor::operational(GCFEvent& event, answer.seqnr = logEvent.seqnr; answer.result = PVSS::SA_NO_ERROR; for (uint32 i = 0; i < logEvent.msgCount; i++) { - PVSSresult result; + PVSSresult result(PVSS::SA_NO_ERROR); // = itsDPservice->setValue(logEvent.DPnames.theVector[i], // GCFPVString(logEvent.messages.theVector[i])); switch (result) { diff --git a/MAC/APL/Log_Client/src/LogClient.cc b/MAC/APL/Log_Client/src/LogClient.cc index 0dbecaced935a1bdb4e6acb276f1edf3cf665b49..ffb39f4bb3b9b0816a61d405e4feecd5967a69b5 100644 --- a/MAC/APL/Log_Client/src/LogClient.cc +++ b/MAC/APL/Log_Client/src/LogClient.cc @@ -155,11 +155,10 @@ GCFEvent::TResult LogClient::operational(GCFEvent& event, LOG_DEBUG_STR("operational:" << eventName(event) << "@" << port.getName()); GCFEvent::TResult status = GCFEvent::HANDLED; - static unsigned long garbageTimerID = 0; switch (event.signal) { case F_ENTRY: - garbageTimerID = itsTimerPort->setTimer(1.0, 5.0); + itsTimerPort->setTimer(1.0, 5.0); break; // Catch incoming connections of new clients diff --git a/MAC/APL/PIC/RSP_Driver/src/SyncAction.cc b/MAC/APL/PIC/RSP_Driver/src/SyncAction.cc index 587a3e2ad6b3c16559dfe8f9ef8027cf9a6d5e45..2c1c9efd0d6853a819bde17b8cd13ef8eb2a1a05 100644 --- a/MAC/APL/PIC/RSP_Driver/src/SyncAction.cc +++ b/MAC/APL/PIC/RSP_Driver/src/SyncAction.cc @@ -54,8 +54,6 @@ SyncAction::~SyncAction() GCFEvent::TResult SyncAction::idle_state(GCFEvent& event, GCFPortInterface& /*port*/) { - GCFEvent::TResult status = GCFEvent::HANDLED; - switch (event.signal) { case F_INIT: { } @@ -75,7 +73,7 @@ GCFEvent::TResult SyncAction::idle_state(GCFEvent& event, GCFPortInterface& /*po break; default: - status = GCFEvent::NOT_HANDLED; + return GCFEvent::NOT_HANDLED; break; } @@ -84,8 +82,6 @@ GCFEvent::TResult SyncAction::idle_state(GCFEvent& event, GCFPortInterface& /*po GCFEvent::TResult SyncAction::sendrequest_state(GCFEvent& event, GCFPortInterface& /*port*/) { - GCFEvent::TResult status = GCFEvent::HANDLED; - switch (event.signal) { case F_ENTRY: { for (;;) { @@ -126,7 +122,7 @@ GCFEvent::TResult SyncAction::sendrequest_state(GCFEvent& event, GCFPortInterfac break; default: - status = GCFEvent::NOT_HANDLED; + return GCFEvent::NOT_HANDLED; break; } diff --git a/MAC/APL/PIC/TBB_Driver/src/DriverSettings.cc b/MAC/APL/PIC/TBB_Driver/src/DriverSettings.cc index adb1eed541892455f566e05ff1d227ed42fb3e7d..cd0401581ed8f6ee26d3f6f391cb1815bcdfee11 100644 --- a/MAC/APL/PIC/TBB_Driver/src/DriverSettings.cc +++ b/MAC/APL/PIC/TBB_Driver/src/DriverSettings.cc @@ -165,6 +165,7 @@ void TbbSettings::getTbbSettings() ,itsBoardInfo[boardnr].dstIpCep.c_str() ,itsBoardInfo[boardnr].dstMacCep.c_str())); } + (void)configOK; } //---- setBoardPorts ------------------------------ diff --git a/MAC/APL/PIC/TBB_Driver/src/TBBDriver.cc b/MAC/APL/PIC/TBB_Driver/src/TBBDriver.cc index 3eecdc6c23ed193a93df2defc45683e823cf862e..0e78f02cd1b95fa572ee31c4949a135d057362c9 100644 --- a/MAC/APL/PIC/TBB_Driver/src/TBBDriver.cc +++ b/MAC/APL/PIC/TBB_Driver/src/TBBDriver.cc @@ -1385,6 +1385,7 @@ bool TBBDriver::handleTbbCommandFromQueue() // command handled, now delete it from queue TbbEvent* tmp = itsTbbQueue->front(); itsTbbQueue->pop_front(); + (void)status; delete e; delete tmp; return(tp_cmd); diff --git a/MAC/APL/VHECR/src/VHECRTask.cc b/MAC/APL/VHECR/src/VHECRTask.cc index ca98e58a6a72f43ad3b7309729ff4d1daebc94f5..0e604f4a1d9d724ac6bcc9566476e327504a6022 100644 --- a/MAC/APL/VHECR/src/VHECRTask.cc +++ b/MAC/APL/VHECR/src/VHECRTask.cc @@ -311,11 +311,10 @@ namespace LOFAR { // - adds the trigger message to the buffer // - first check if its timestamp is valid! void VHECRTask::addTrigger(const TBBTrigger& trigger) { - int newindex; // cout << "Received trigger: " << trigger.itsRcuNr << ", " << trigger.itsTime <<endl; if (trigger.itsTime < 2.1e9) { - newindex = add2buffer(trigger); + add2buffer(trigger); } else { // cout << "Discarded trigger! " << trigger.itsTime << endl; @@ -761,7 +760,7 @@ namespace LOFAR { minDebugTimeOffsets[k] = debugTimeOffsets[k] - mu/nofChannels; } } - + (void)minDebugTimeOffsets; // cout << "theta = " << 360.0/TWOPI * (TWOPI/4 - theta) << ", phi = " << (double)j / phiSteps * 360 << ": fitResult = " << fitResult[i][j] << endl; }