Diff: MapEntry.cpp

Revision:

12:9af48d60705f

Parent:

11:f1c9299a3ca1

Child:

20:f2dbbd852e08

--- a/MapEntry.cpp	Tue Feb 25 16:33:18 2014 +0000
+++ b/MapEntry.cpp	Tue Feb 25 17:10:47 2014 +0000
@@ -23,16 +23,29 @@
  MapEntry::MapEntry(char *ioc_name,char *mbed_name) {
      memset(this->m_mbed_name,0,MAX_NAME_LENGTH+1);
      memset(this->m_ioc_name,0,MAX_NAME_LENGTH+1);
+     memset(this->m_ioc_nickname,0,MAX_NAME_LENGTH+1);
      strncpy(this->m_mbed_name,mbed_name,this->min(strlen(mbed_name),MAX_NAME_LENGTH));
      strncpy(this->m_ioc_name,ioc_name,this->min(strlen(ioc_name),MAX_NAME_LENGTH));
  }
  
+ // constructor
+ MapEntry::MapEntry(char *ioc_name,char *mbed_name,char *ioc_nickname) {
+     memset(this->m_mbed_name,0,MAX_NAME_LENGTH+1);
+     memset(this->m_ioc_name,0,MAX_NAME_LENGTH+1);
+     memset(this->m_ioc_nickname,0,MAX_NAME_LENGTH+1);
+     strncpy(this->m_mbed_name,mbed_name,this->min(strlen(mbed_name),MAX_NAME_LENGTH));
+     strncpy(this->m_ioc_name,ioc_name,this->min(strlen(ioc_name),MAX_NAME_LENGTH));
+     strncpy(this->m_ioc_nickname,ioc_nickname,this->min(strlen(ioc_nickname),MAX_NAME_LENGTH));
+ }
+ 
  // copy constructor
  MapEntry::MapEntry(MapEntry &entry) {
      memset(this->m_mbed_name,0,MAX_NAME_LENGTH+1);
      memset(this->m_ioc_name,0,MAX_NAME_LENGTH+1);
+     memset(this->m_ioc_nickname,0,MAX_NAME_LENGTH+1);
      strcpy(this->m_mbed_name,entry.m_mbed_name);
      strcpy(this->m_ioc_name,entry.m_ioc_name);
+     strcpy(this->m_ioc_nickname,entry.m_ioc_nickname);
  }
  
  // destructor
@@ -42,6 +55,9 @@
  // get the IOC name     
  char *MapEntry::iocName() { return this->m_ioc_name; }
  
+ // get the IOC nickname
+ char *MapEntry::iocNickName() { if (strlen(this->m_ioc_nickname) > 0) return this->m_ioc_nickname; return NULL; }
+ 
  // get the MBED name
  char *MapEntry::mbedName() { return this->m_mbed_name; }