From ea8c10ee7cc834d0a55b122eb1df9383670113c2 Mon Sep 17 00:00:00 2001
From: Marcel Loose <loose@astron.nl>
Date: Tue, 18 Dec 2012 12:12:36 +0000
Subject: [PATCH] =?UTF-8?q?Task=20#3942:=20Fixed=20warning:=20variable=20?=
=?UTF-8?q?=E2=80=98xxx=E2=80=99=20set=20but=20not=20used=20[-Wunused-but-?=
=?UTF-8?q?set-variable]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../CURTDBDaemons/src/KeyValueLogger/KeyValueLogger.cc | 3 +--
MAC/APL/CURTDBDaemons/src/LogProcessor/LogProcessor.cc | 5 ++---
MAC/APL/Log_Client/src/LogClient.cc | 3 +--
MAC/APL/PIC/RSP_Driver/src/SyncAction.cc | 8 ++------
MAC/APL/PIC/TBB_Driver/src/DriverSettings.cc | 1 +
MAC/APL/PIC/TBB_Driver/src/TBBDriver.cc | 1 +
MAC/APL/VHECR/src/VHECRTask.cc | 5 ++---
7 files changed, 10 insertions(+), 16 deletions(-)
diff --git a/MAC/APL/CURTDBDaemons/src/KeyValueLogger/KeyValueLogger.cc b/MAC/APL/CURTDBDaemons/src/KeyValueLogger/KeyValueLogger.cc
index 96337bed91b..69f20c8976a 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 08a5972dc14..82d4c0951e0 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 0dbecaced93..ffb39f4bb3b 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 587a3e2ad6b..2c1c9efd0d6 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 adb1eed5418..cd0401581ed 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 3eecdc6c23e..0e78f02cd1b 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 ca98e58a6a7..0e604f4a1d9 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;
}
--
GitLab