From 56d90bdcebe9b622f32e27792038589be1932a6b Mon Sep 17 00:00:00 2001
From: Xavier Elattaoui <xavier.elattaoui@synchrotron-soleil.fr>
Date: Fri, 26 Feb 2016 16:34:56 +0000
Subject: [PATCH] GetElectroType command bug fixed.
---
pom.xml | 4 ++--
src/MCCE2Electrometers.cpp | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 31c3f4d..b7575e5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,7 @@
</parent>
<groupId>fr.soleil.device</groupId>
<artifactId>MCCE2Electrometers-${aol}-${mode}</artifactId>
- <version>2.2.8-SNAPSHOT</version>
+ <version>2.2.8</version>
<packaging>nar</packaging>
<name>MCCE2Electrometers</name>
<!-- use for the name of executable -->
@@ -25,7 +25,7 @@
<dependency>
<groupId>fr.soleil.lib</groupId>
<artifactId>Electrometers-${aol}-${library}-${mode}</artifactId>
- <!-- <version>2.5.15</version> -->
+ <!-- <version>2.5.19</version> -->
</dependency>
<dependency>
<groupId>fr.soleil.lib</groupId>
diff --git a/src/MCCE2Electrometers.cpp b/src/MCCE2Electrometers.cpp
index 9b9be09..70b1c95 100644
--- a/src/MCCE2Electrometers.cpp
+++ b/src/MCCE2Electrometers.cpp
@@ -2632,12 +2632,12 @@ Tango::DevString MCCE2Electrometers::get_electrometer_type_str(Tango::DevUShort
if ( argin == ELETRO_CHANNEL_ONE )
{
argout = new char[this->_electroCH1StrType.size()+1];
- ::strncpy(argout, _electroCH1StrType.c_str(), _electroCH1StrType.size());
+ ::strncpy(argout, _electroCH1StrType.c_str(), _electroCH1StrType.size()+1);
}
else if ( argin == ELETRO_CHANNEL_TWO )
{
argout = new char[this->_electroCH2StrType.size()+1];
- ::strncpy(argout, _electroCH2StrType.c_str(), _electroCH2StrType.size());
+ ::strncpy(argout, _electroCH2StrType.c_str(), _electroCH2StrType.size()+1);
}
else
{
--
GitLab