Fix #136: warnings in SRTKBandMFReceiver (50af31f1) · Commits · INAF / DISCOS

SRT/Servers/SRTKBandMFReceiver/src/Configuration.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -27,7 +27,7 @@ using namespace IRA;
		} \
		else { \
		FIELD=tmpw; \
		ACS_DEBUG_PARAM("CConfiguration::Init()",DESCR" %lu",tmpw); \
		ACS_DEBUG_PARAM("CConfiguration::Init()",DESCR" %u",tmpw); \
		} \
		}

SRT/Servers/SRTKBandMFReceiver/src/MonitorThread.cpp

+9 −2

Original line number	Diff line number	Diff line
		@@ -37,8 +37,15 @@ void CMonitorThread::onStart()
		if(m_currentResponseTime < m_currentSampling+m_currentSampling/10) {
		// Force the response time to be at least 10% more than sampling time
		m_currentResponseTime = m_currentSampling + m_currentSampling / 10;
		ACS_LOG(LM_FULL_INFO, "SRTKBandMFReceiverImpl::execute()", (LM_WARNING, \
		"WATCH_DOG_RESPONSE_TIME_ADJUSTED_TO_FIT_SAMPLING_TIME: %llu uSec", m_currentResponseTime/10));
		ACS_LOG(
		LM_FULL_INFO,
		"SRTKBandMFReceiverImpl::execute()",
		(
		LM_WARNING,
		"WATCH_DOG_RESPONSE_TIME_ADJUSTED_TO_FIT_SAMPLING_TIME: %llu uSec",
		static_cast<long long unsigned int>(m_currentResponseTime/10)
		)
		);
		setResponseTime(m_currentResponseTime);
		}
		}

SRT/Servers/SRTKBandMFReceiver/src/icdSocket.cpp

+17 −17

Original line number	Diff line number	Diff line
		@@ -347,7 +347,7 @@ void icdSocket::setSpeed(DWORD speed) throw (


		if(speed < m_ICD_MIN_SPEED \|\| speed > m_ICD_MAX_SPEED) {
		ACS_SHORT_LOG((LM_ERROR, "# Error - max speed out of range [%.2f, %.2f] rpm",
		ACS_SHORT_LOG((LM_ERROR, "# Error - max speed out of range [%u, %u] rpm",
		m_ICD_MIN_SPEED, m_ICD_MAX_SPEED));
		m_icd_summary_status \|= (1 << W);

		@@ -882,10 +882,10 @@ void icdSocket::responseCheck(BYTE *buff, bool check=true) throw (ComponentError
		m_icd_verbose_status &= ~(1 << WRONG_RFLAG) ;
		m_icd_verbose_status &= ~(1 << WRONG_RCODE) ;
		ACS_SHORT_LOG((LM_ERROR, "# CMDERR - ERROR CODE: (%c%c%c%ch)",
		(const char*)buff[ICD_BUFF_LEN-5],
		(const char*)buff[ICD_BUFF_LEN-4],
		(const char*)buff[ICD_BUFF_LEN-3],
		(const char*)buff[ICD_BUFF_LEN-2]
		(unsigned char)buff[ICD_BUFF_LEN-5],
		(unsigned char)buff[ICD_BUFF_LEN-4],
		(unsigned char)buff[ICD_BUFF_LEN-3],
		(unsigned char)buff[ICD_BUFF_LEN-2]
		));
		break ;

		@@ -895,10 +895,10 @@ void icdSocket::responseCheck(BYTE *buff, bool check=true) throw (ComponentError
		m_icd_verbose_status &= ~(1 << WRONG_RCODE) ;
		ACS_SHORT_LOG((LM_ERROR, "# WRONG RESPONSE FLAG. First byte: %X", buff[0]));
		ACS_SHORT_LOG((LM_ERROR, "# CMDERR - ERROR CODE: (%c%c%c%ch)",
		(const char*)buff[ICD_BUFF_LEN-5],
		(const char*)buff[ICD_BUFF_LEN-4],
		(const char*)buff[ICD_BUFF_LEN-3],
		(const char*)buff[ICD_BUFF_LEN-2]
		(unsigned char)buff[ICD_BUFF_LEN-5],
		(unsigned char)buff[ICD_BUFF_LEN-4],
		(unsigned char)buff[ICD_BUFF_LEN-3],
		(unsigned char)buff[ICD_BUFF_LEN-2]
		));
		break ;

		@@ -928,10 +928,10 @@ void icdSocket::responseCheck(BYTE *buff, bool check=true) throw (ComponentError
		m_icd_verbose_status &= ~(1 << WRONG_RCODE) ;
		ACS_SHORT_LOG((LM_ERROR, "# WRONG RESPONSE FLAG. First byte: %X", buff[0]));
		ACS_SHORT_LOG((LM_ERROR, "# CMDERR - ERROR CODE: (%c%c%c%ch)",
		(const char*)buff[ICD_BUFF_LEN-5],
		(const char*)buff[ICD_BUFF_LEN-4],
		(const char*)buff[ICD_BUFF_LEN-3],
		(const char*)buff[ICD_BUFF_LEN-2]
		(unsigned char)buff[ICD_BUFF_LEN-5],
		(unsigned char)buff[ICD_BUFF_LEN-4],
		(unsigned char)buff[ICD_BUFF_LEN-3],
		(unsigned char)buff[ICD_BUFF_LEN-2]
		));
		break ;

		@@ -940,10 +940,10 @@ void icdSocket::responseCheck(BYTE *buff, bool check=true) throw (ComponentError
		m_icd_verbose_status &= ~(1 << WRONG_RFLAG) ;
		m_icd_verbose_status &= ~(1 << WRONG_RCODE) ;
		ACS_SHORT_LOG((LM_ERROR, "# CMDERR - ERROR CODE: (%c%c%c%ch)",
		(const char*)buff[ICD_BUFF_LEN-5],
		(const char*)buff[ICD_BUFF_LEN-4],
		(const char*)buff[ICD_BUFF_LEN-3],
		(const char*)buff[ICD_BUFF_LEN-2]
		(unsigned char)buff[ICD_BUFF_LEN-5],
		(unsigned char)buff[ICD_BUFF_LEN-4],
		(unsigned char)buff[ICD_BUFF_LEN-3],
		(unsigned char)buff[ICD_BUFF_LEN-2]
		));
		break ;