From 3c774478681813e451df683e2bc8403b37490323 Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Fri, 8 Feb 2019 16:32:23 +0100 Subject: [PATCH] removed minor warnings --- slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp | 6 +++--- slsDetectorSoftware/slsDetector/slsDetector.cpp | 3 ++- slsReceiverSoftware/include/logger.h | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp index 16bea3d0a..172eb8c4e 100644 --- a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp +++ b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp @@ -604,7 +604,7 @@ int64_t multiSlsDetector::getId(idMode mode, int imod) { slsDetector* multiSlsDetector::getSlsDetector(unsigned int pos) { - if (pos >= 0 && pos < detectors.size()) { + if (pos < detectors.size()) { return detectors[pos]; } return 0; @@ -2343,7 +2343,7 @@ int multiSlsDetector::sendSoftwareTrigger() { int multiSlsDetector::startReadOut() { - unsigned int i = 0; + int i = 0; int ret = OK, ret1 = OK; i = thisMultiDetector->masterPosition; if (i >= 0) { @@ -2353,7 +2353,7 @@ int multiSlsDetector::startReadOut() { if (ret != OK) ret1 = FAIL; } - for (i = 0; i < detectors.size(); ++i) { + for (i = 0; i < (int)detectors.size(); ++i) { ret = detectors[i]->startReadOut(); if (detectors[i]->getErrorMask()) setErrorMask(getErrorMask() | (1 << i)); diff --git a/slsDetectorSoftware/slsDetector/slsDetector.cpp b/slsDetectorSoftware/slsDetector/slsDetector.cpp index 27e22c84e..f282dc8a6 100644 --- a/slsDetectorSoftware/slsDetector/slsDetector.cpp +++ b/slsDetectorSoftware/slsDetector/slsDetector.cpp @@ -5355,12 +5355,13 @@ string slsDetector::setReceiverUDPMAC(string udpmac) { if((udpmac[2]==':')&&(udpmac[5]==':')&&(udpmac[8]==':')&& (udpmac[11]==':')&&(udpmac[14]==':')){ strcpy(thisDetector->receiverUDPMAC,udpmac.c_str()); - if(!strcmp(thisDetector->receiver_hostname,"none")) + if(!strcmp(thisDetector->receiver_hostname,"none")) { #ifdef VERBOSE std::cout << "Warning: Receiver hostname not set yet." << endl; #else ; #endif + } /* else if(setUDPConnection()==FAIL){ commented out to be replaced by user * defined udpmac std::cout<< "Warning: UDP connection set up failed" << std::endl; diff --git a/slsReceiverSoftware/include/logger.h b/slsReceiverSoftware/include/logger.h index 124013d48..32370605c 100644 --- a/slsReceiverSoftware/include/logger.h +++ b/slsReceiverSoftware/include/logger.h @@ -115,7 +115,7 @@ inline std::string NowTime() const int buffer_len = sizeof(buffer); time_t t; time(&t); - tm r = {}; + tm r; strftime(buffer, buffer_len, "%X", localtime_r(&t, &r)); buffer[buffer_len - 1] = 0; struct timeval tv;