Define once, use multiple times.

coupler/opc-ua-server/common.h

@@ -64,6 +64,24 @@ char *randomString(size_t length)
     return randomString;
 }
 
+char *convertInt2Str(int my_int){
+  /* Convert integer to string */
+  int length = snprintf( NULL, 0, "%d", my_int);
+  char *my_str = malloc(length + 1);
+  snprintf(my_str, length + 1, "%d", my_int);
+  return my_str;
+}
+
+char *convertLongInt2Str(long int my_int){
+  /* Convert integer to string */
+  int length = snprintf( NULL, 0, "%ld", my_int);
+  char *my_str = malloc(length + 1);
+  snprintf(my_str, length + 1, "%ld", my_int);
+  return my_str;
+}
+
+
+
 // XXX: dictionary implementation based on https://gist.github.com/kylef/86784/fe97567ec9baf5c0dce3c7fcbec948e21dfcce09
 
 typedef struct dict_t_struct {

coupler/opc-ua-server/keep_alive_subscriber.h

@@ -19,6 +19,7 @@ UA_DataSetReaderConfig readerConfig;
 
 static void fillTestDataSetMetaData(UA_DataSetMetaDataType *pMetaData);
 
+
 /* callback to handle change notifications */
 static void dataChangeNotificationCallback(UA_Server *server, UA_UInt32 monitoredItemId,
                                void *monitoredItemContext, const UA_NodeId *nodeId,
@@ -34,15 +35,11 @@ static void dataChangeNotificationCallback(UA_Server *server, UA_UInt32 monitore
           //HEART_BEAT_ID_LIST
           UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "Got heart beat from ID = %d, timestamp=%ld", coupler_id, micro_seconds);
  
-          // convert coupler_id to str (XXX: define as a function)
-          int length = snprintf( NULL, 0, "%d", coupler_id);
-          char* coupler_id_str = malloc(length + 1);
-          snprintf(coupler_id_str, length + 1, "%d", coupler_id);
+          // convert coupler_id to str
+          char* coupler_id_str = convertInt2Str(coupler_id);
 
-          // convert micro seconds to str (XXX: define as afunction)
-          length = snprintf( NULL, 0, "%ld", micro_seconds);
-          char* micro_seconds_str = malloc(length + 1);
-          snprintf(micro_seconds_str, length + 1, "%ld", micro_seconds);
+          // convert micro seconds to str
+          char* micro_seconds_str = convertLongInt2Str(micro_seconds);
 
           // XXX: implement check for dead couplers using asynchronous callbacks from open62541
           int i, id;
@@ -50,10 +47,8 @@ static void dataChangeNotificationCallback(UA_Server *server, UA_UInt32 monitore
           for (int i = 0; i < n; i++) {
             id = HEART_BEAT_ID_LIST[i];
             if (id > 0) {
-              // XXX: define as a function
-              length = snprintf( NULL, 0, "%d", id);
-              char* id_str = malloc(length + 1);
-              snprintf(id_str, length + 1, "%d", id);
+              // convert to str as this is the hash key
+              char* id_str = convertInt2Str(id);
               char *last_seen_timestamp = getItem(SUBSCRIBER_DICT, id_str);
               UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "\tcheck ID=%s, last_seen=%s", id_str, last_seen_timestamp);
               if (last_seen_timestamp!=NULL){