From 4e22efc40306cf8015bfa8209ddf754b570a9ff5 Mon Sep 17 00:00:00 2001 From: aszostak Date: Fri, 17 Oct 2008 18:47:54 +0000 Subject: [PATCH] Removing compilation warnings. --- .../AliHLTMUONDigitPublisherComponent.cxx | 4 ++-- HLT/MUON/OfflineInterface/AliHLTMUONESDMaker.cxx | 2 ++ HLT/MUON/OfflineInterface/AliHLTMUONRecHitsSource.cxx | 4 ++-- .../OfflineInterface/AliHLTMUONRootifierComponent.cxx | 2 ++ .../OfflineInterface/AliHLTMUONTriggerRecordsSource.cxx | 4 ++-- .../OnlineAnalysis/AliHLTMUONClusterFinderComponent.cxx | 6 +++--- HLT/MUON/OnlineAnalysis/AliHLTMUONDecisionComponent.cxx | 4 +++- .../AliHLTMUONHitReconstructorComponent.cxx | 8 +++++--- HLT/MUON/OnlineAnalysis/AliHLTMUONMansoTrackerFSM.cxx | 1 + .../OnlineAnalysis/AliHLTMUONMansoTrackerFSMComponent.cxx | 6 ++++-- .../OnlineAnalysis/AliHLTMUONMansoTrackerFSMComponent.h | 2 +- .../AliHLTMUONTriggerReconstructorComponent.cxx | 8 +++++--- HLT/MUON/utils/AliHLTMUONDataCheckerComponent.cxx | 2 ++ 13 files changed, 34 insertions(+), 19 deletions(-) diff --git a/HLT/MUON/OfflineInterface/AliHLTMUONDigitPublisherComponent.cxx b/HLT/MUON/OfflineInterface/AliHLTMUONDigitPublisherComponent.cxx index ff254f4b16b..12a3c58346e 100644 --- a/HLT/MUON/OfflineInterface/AliHLTMUONDigitPublisherComponent.cxx +++ b/HLT/MUON/OfflineInterface/AliHLTMUONDigitPublisherComponent.cxx @@ -445,9 +445,9 @@ int AliHLTMUONDigitPublisherComponent::DoInit(int argc, const char** argv) HLTError("Expected a positive number after -firstevent."); return -EINVAL; } - char* end = ""; + char* end = NULL; long num = strtol(argv[i], &end, 0); - if (*end != '\0' or num < 0) // Check if the conversion is OK. + if ((end != NULL and *end != '\0') or num < 0) // Check if the conversion is OK. { HLTError("Expected a positive number after -firstevent" " but got: %s", argv[i] diff --git a/HLT/MUON/OfflineInterface/AliHLTMUONESDMaker.cxx b/HLT/MUON/OfflineInterface/AliHLTMUONESDMaker.cxx index f3b22830921..cb4a6d22dcf 100644 --- a/HLT/MUON/OfflineInterface/AliHLTMUONESDMaker.cxx +++ b/HLT/MUON/OfflineInterface/AliHLTMUONESDMaker.cxx @@ -250,10 +250,12 @@ int AliHLTMUONESDMaker::DoEvent( HLTWarning("Received a data block of a type we cannot handle: '%s', spec: 0x%X", DataType2Text(block->fDataType).c_str(), block->fSpecification ); +#ifdef __DEBUG else HLTDebug("Received a data block of a type we cannot handle: '%s', spec: 0x%X", DataType2Text(block->fDataType).c_str(), block->fSpecification ); +#endif } } } diff --git a/HLT/MUON/OfflineInterface/AliHLTMUONRecHitsSource.cxx b/HLT/MUON/OfflineInterface/AliHLTMUONRecHitsSource.cxx index 580e99ba896..a65e47cb568 100644 --- a/HLT/MUON/OfflineInterface/AliHLTMUONRecHitsSource.cxx +++ b/HLT/MUON/OfflineInterface/AliHLTMUONRecHitsSource.cxx @@ -172,9 +172,9 @@ int AliHLTMUONRecHitsSource::DoInit(int argc, const char** argv) HLTError("Expected a positive number after -firstevent."); return -EINVAL; } - char* end = ""; + char* end = NULL; long num = strtol(argv[i], &end, 0); - if (*end != '\0' or num < 0) // Check if the conversion is OK. + if ((end != NULL and *end != '\0') or num < 0) // Check if the conversion is OK. { HLTError( "Expected a positive number after -firstevent" diff --git a/HLT/MUON/OfflineInterface/AliHLTMUONRootifierComponent.cxx b/HLT/MUON/OfflineInterface/AliHLTMUONRootifierComponent.cxx index 2030f9bccf9..0c1ff340b98 100644 --- a/HLT/MUON/OfflineInterface/AliHLTMUONRootifierComponent.cxx +++ b/HLT/MUON/OfflineInterface/AliHLTMUONRootifierComponent.cxx @@ -313,10 +313,12 @@ int AliHLTMUONRootifierComponent::DoEvent( HLTWarning("Received a data block of a type we cannot handle: '%s', spec: 0x%X", DataType2Text(block->fDataType).c_str(), block->fSpecification ); +#ifdef __DEBUG else HLTDebug("Received a data block of a type we cannot handle: '%s', spec: 0x%X", DataType2Text(block->fDataType).c_str(), block->fSpecification ); +#endif } } } diff --git a/HLT/MUON/OfflineInterface/AliHLTMUONTriggerRecordsSource.cxx b/HLT/MUON/OfflineInterface/AliHLTMUONTriggerRecordsSource.cxx index dd588dcea50..aa6163dc31e 100644 --- a/HLT/MUON/OfflineInterface/AliHLTMUONTriggerRecordsSource.cxx +++ b/HLT/MUON/OfflineInterface/AliHLTMUONTriggerRecordsSource.cxx @@ -196,9 +196,9 @@ int AliHLTMUONTriggerRecordsSource::DoInit(int argc, const char** argv) HLTError("Expected a positive number after -firstevent."); return -EINVAL; } - char* end = ""; + char* end = NULL; long num = strtol(argv[i], &end, 0); - if (*end != '\0' or num < 0) // Check if the conversion is OK. + if ((end != NULL and *end != '\0') or num < 0) // Check if the conversion is OK. { HLTError(Form( "Expected a positive number after -firstevent" diff --git a/HLT/MUON/OnlineAnalysis/AliHLTMUONClusterFinderComponent.cxx b/HLT/MUON/OnlineAnalysis/AliHLTMUONClusterFinderComponent.cxx index b43f3c7a2be..3bba05502f3 100644 --- a/HLT/MUON/OnlineAnalysis/AliHLTMUONClusterFinderComponent.cxx +++ b/HLT/MUON/OnlineAnalysis/AliHLTMUONClusterFinderComponent.cxx @@ -205,7 +205,7 @@ int AliHLTMUONClusterFinderComponent::DoInit(int argc, const char** argv) if (not DelaySetup()) { - int result = ReadConfigFromCDB(); + result = ReadConfigFromCDB(); if (result != 0) { // Error messages already generated in ReadConfigFromCDB. @@ -409,9 +409,9 @@ int AliHLTMUONClusterFinderComponent::DoEvent( AliHLTMUONRecHitsBlockWriter outBlock(buffer, bufferSize); outBlock.InitCommonHeader(); AliHLTUInt32_t i = 0; - TIter next(clusterStore->CreateIterator()); + TIter next2(clusterStore->CreateIterator()); AliMUONVCluster* cluster = NULL; - while ( (cluster = static_cast(next())) != NULL ) + while ( (cluster = static_cast(next2())) != NULL ) { AliHLTMUONRecHitStruct& hit = outBlock[i++]; hit.fFlags = AliHLTMUONUtils::PackRecHitFlags( diff --git a/HLT/MUON/OnlineAnalysis/AliHLTMUONDecisionComponent.cxx b/HLT/MUON/OnlineAnalysis/AliHLTMUONDecisionComponent.cxx index d63ea24169b..0d7b93e2e68 100644 --- a/HLT/MUON/OnlineAnalysis/AliHLTMUONDecisionComponent.cxx +++ b/HLT/MUON/OnlineAnalysis/AliHLTMUONDecisionComponent.cxx @@ -316,7 +316,7 @@ int AliHLTMUONDecisionComponent::DoInit(int argc, const char** argv) if (not fLowPtCutSet or not fHighPtCutSet or not fLowMassCutSet or not fHighMassCutSet) { HLTInfo("Loading cut parameters from CDB."); - int result = ReadConfigFromCDB( + result = ReadConfigFromCDB( not fLowPtCutSet, not fHighPtCutSet, not fLowMassCutSet, not fHighMassCutSet ); @@ -467,10 +467,12 @@ int AliHLTMUONDecisionComponent::DoEvent( HLTWarning("Received a data block of a type we cannot handle: '%s', spec: 0x%X", DataType2Text(blocks[n].fDataType).c_str(), blocks[n].fSpecification ); +#ifdef __DEBUG else HLTDebug("Received a data block of a type we cannot handle: '%s', spec: 0x%X", DataType2Text(blocks[n].fDataType).c_str(), blocks[n].fSpecification ); +#endif } } diff --git a/HLT/MUON/OnlineAnalysis/AliHLTMUONHitReconstructorComponent.cxx b/HLT/MUON/OnlineAnalysis/AliHLTMUONHitReconstructorComponent.cxx index 54254f25773..49edcf1aa45 100644 --- a/HLT/MUON/OnlineAnalysis/AliHLTMUONHitReconstructorComponent.cxx +++ b/HLT/MUON/OnlineAnalysis/AliHLTMUONHitReconstructorComponent.cxx @@ -367,7 +367,7 @@ int AliHLTMUONHitReconstructorComponent::DoInit(int argc, const char** argv) HLTInfo("Loading lookup table information from CDB for DDL %d (ID = %d).", fDDL+1, AliHLTMUONUtils::DDLNumberToEquipId(fDDL) ); - int result = ReadLutFromCDB(); + result = ReadLutFromCDB(); if (result != 0) { // Error messages already generated in ReadLutFromCDB. @@ -380,7 +380,7 @@ int AliHLTMUONHitReconstructorComponent::DoInit(int argc, const char** argv) else { HLTInfo("Loading lookup table information from file %s.", lutFileName); - int result = ReadLookUpTable(lutFileName); + result = ReadLookUpTable(lutFileName); if (result != 0) { // Error messages already generated in ReadLookUpTable. @@ -397,7 +397,7 @@ int AliHLTMUONHitReconstructorComponent::DoInit(int argc, const char** argv) HLTInfo("Loading DC cut parameters from CDB for DDL %d (ID = %d).", fDDL+1, AliHLTMUONUtils::DDLNumberToEquipId(fDDL) ); - int result = ReadDCCutFromCDB(); + result = ReadDCCutFromCDB(); if (result != 0) { // Error messages already generated in ReadDCCutFromCDB. @@ -611,10 +611,12 @@ int AliHLTMUONHitReconstructorComponent::DoEvent( HLTWarning("Received a data block of a type we cannot handle: '%s', spec: 0x%X", DataType2Text(blocks[n].fDataType).c_str(), blocks[n].fSpecification ); +#ifdef __DEBUG else HLTDebug("Received a data block of a type we cannot handle: '%s', spec: 0x%X", DataType2Text(blocks[n].fDataType).c_str(), blocks[n].fSpecification ); +#endif continue; } diff --git a/HLT/MUON/OnlineAnalysis/AliHLTMUONMansoTrackerFSM.cxx b/HLT/MUON/OnlineAnalysis/AliHLTMUONMansoTrackerFSM.cxx index ce2c030c9bb..b3c4bcfec90 100644 --- a/HLT/MUON/OnlineAnalysis/AliHLTMUONMansoTrackerFSM.cxx +++ b/HLT/MUON/OnlineAnalysis/AliHLTMUONMansoTrackerFSM.cxx @@ -200,6 +200,7 @@ AliHLTMUONRecHitStruct AliHLTMUONMansoTrackerFSM::AliLine::FindIntersectWithXYPl else t = 0; AliHLTMUONRecHitStruct p; + p.fFlags = 0; p.fX = fMx*t + fCx; p.fY = fMy*t + fCy; p.fZ = z; diff --git a/HLT/MUON/OnlineAnalysis/AliHLTMUONMansoTrackerFSMComponent.cxx b/HLT/MUON/OnlineAnalysis/AliHLTMUONMansoTrackerFSMComponent.cxx index fa70206391c..9294e08f4bd 100644 --- a/HLT/MUON/OnlineAnalysis/AliHLTMUONMansoTrackerFSMComponent.cxx +++ b/HLT/MUON/OnlineAnalysis/AliHLTMUONMansoTrackerFSMComponent.cxx @@ -21,7 +21,7 @@ /// @file AliHLTMUONMansoTrackerFSMComponent.cxx /// @author Artur Szostak , /// Indranil Das -/// @date +/// @date 18 Sep 2007 /// @brief Implementation of AliHLTMUONMansoTrackerFSMComponent class. /// @@ -406,7 +406,7 @@ int AliHLTMUONMansoTrackerFSMComponent::DoInit(int argc, const char** argv) { HLTInfo("Loading configuration parameters from CDB."); - int result = ReadConfigFromCDB(); + result = ReadConfigFromCDB(); if (result != 0) { // Error messages already generated in ReadConfigFromCDB. @@ -798,10 +798,12 @@ int AliHLTMUONMansoTrackerFSMComponent::DoEvent( HLTWarning("Received a data block of a type we cannot handle: '%s', spec: 0x%X", DataType2Text(blocks[n].fDataType).c_str(), blocks[n].fSpecification ); +#ifdef __DEBUG else HLTDebug("Received a data block of a type we cannot handle: '%s', spec: 0x%X", DataType2Text(blocks[n].fDataType).c_str(), blocks[n].fSpecification ); +#endif } } diff --git a/HLT/MUON/OnlineAnalysis/AliHLTMUONMansoTrackerFSMComponent.h b/HLT/MUON/OnlineAnalysis/AliHLTMUONMansoTrackerFSMComponent.h index d3a347395b7..a3a300d19c2 100644 --- a/HLT/MUON/OnlineAnalysis/AliHLTMUONMansoTrackerFSMComponent.h +++ b/HLT/MUON/OnlineAnalysis/AliHLTMUONMansoTrackerFSMComponent.h @@ -23,7 +23,7 @@ /// @file AliHLTMUONMansoTrackerFSMComponent.h /// @author Artur Szostak , /// Indranil Das -/// @date +/// @date 18 Sep 2007 /// @brief Tracker component for the dimuon HLT using the Manso algorithm /// implemented as a finite state machine. /// diff --git a/HLT/MUON/OnlineAnalysis/AliHLTMUONTriggerReconstructorComponent.cxx b/HLT/MUON/OnlineAnalysis/AliHLTMUONTriggerReconstructorComponent.cxx index 44423770836..4cbb99b60a8 100644 --- a/HLT/MUON/OnlineAnalysis/AliHLTMUONTriggerReconstructorComponent.cxx +++ b/HLT/MUON/OnlineAnalysis/AliHLTMUONTriggerReconstructorComponent.cxx @@ -432,7 +432,7 @@ int AliHLTMUONTriggerReconstructorComponent::DoInit(int argc, const char** argv) HLTInfo("Loading lookup table information from CDB for DDL %d (ID = %d).", fDDL+1, AliHLTMUONUtils::DDLNumberToEquipId(fDDL) ); - int result = ReadLutFromCDB(); + result = ReadLutFromCDB(); if (result != 0) { // Error messages already generated in ReadLutFromCDB. @@ -446,7 +446,7 @@ int AliHLTMUONTriggerReconstructorComponent::DoInit(int argc, const char** argv) else { HLTInfo("Loading lookup table information from file %s.", lutFileName); - int result = ReadLookUpTable(lutFileName); + result = ReadLookUpTable(lutFileName); if (result != 0) { // Error messages already generated in ReadLookUpTable. @@ -468,7 +468,7 @@ int AliHLTMUONTriggerReconstructorComponent::DoInit(int argc, const char** argv) fDDL+1, AliHLTMUONUtils::DDLNumberToEquipId(fDDL) ); - int result = ReadConfigFromCDB(not fZmiddleSpecified, not fBLSpecified); + result = ReadConfigFromCDB(not fZmiddleSpecified, not fBLSpecified); if (result != 0) { // Error messages already generated in ReadConfigFromCDB. @@ -613,10 +613,12 @@ int AliHLTMUONTriggerReconstructorComponent::DoEvent( HLTWarning("Received a data block of a type we cannot handle: '%s', spec: 0x%X", DataType2Text(blocks[n].fDataType).c_str(), blocks[n].fSpecification ); +#ifdef __DEBUG else HLTDebug("Received a data block of a type we cannot handle: '%s', spec: 0x%X", DataType2Text(blocks[n].fDataType).c_str(), blocks[n].fSpecification ); +#endif continue; } diff --git a/HLT/MUON/utils/AliHLTMUONDataCheckerComponent.cxx b/HLT/MUON/utils/AliHLTMUONDataCheckerComponent.cxx index e494902a858..7231499a3f5 100644 --- a/HLT/MUON/utils/AliHLTMUONDataCheckerComponent.cxx +++ b/HLT/MUON/utils/AliHLTMUONDataCheckerComponent.cxx @@ -391,12 +391,14 @@ int AliHLTMUONDataCheckerComponent::DoEvent( DataType2Text(blocks[n].fDataType).c_str(), blocks[n].fSpecification ); +#ifdef __DEBUG else HLTDebug("Received a data block of a type we cannot" " handle: '%s', spec: 0x%8.8X", DataType2Text(blocks[n].fDataType).c_str(), blocks[n].fSpecification ); +#endif } } -- 2.43.0