Cleanup. Rename.

coupler/opc-ua-server/cli.h

@@ -71,7 +71,7 @@ static error_t parse_opt(int key, char *arg, struct argp_state *state)
       arguments->key = arg;
       break;
     case 'i':
-      arguments->id = arg ? atoi (arg) : DEFAULT_ID;
+      arguments->id = arg ? atoi (arg) : DEFAULT_COUPLER_ID;
       break;
     case 'b':
       arguments->heart_beat = atoi (arg);
@@ -112,7 +112,7 @@ void handleCLI(int argc, char **argv) {
     arguments.password = "";
     arguments.key = "";
     arguments.certificate = "";
-    arguments.id = DEFAULT_ID;
+    arguments.id = DEFAULT_COUPLER_ID;
     arguments.heart_beat_interval = DEFAULT_HEART_BEAT_INTERVAL;
     arguments.network_address_url_data_type = NETWORK_ADDRESS_URL_DATA_TYPE;
     argp_parse(&argp, argc, argv, 0, 0, &arguments);

coupler/opc-ua-server/server.c

@@ -45,7 +45,7 @@ dict_t *SUBSCRIBER_DICT;
 // The default port of OPC-UA server
 const int DEFAULT_OPC_UA_PORT = 4840;
 const int DEFAULT_MODE = 0;
-const int DEFAULT_ID = 0;
+const int DEFAULT_COUPLER_ID = 0;
 
 int OPC_UA_PORT;
 bool ENABLE_HEART_BEAT = false;
@@ -71,11 +71,6 @@ static void stopHandler(int sign)
 
 int main(int argc, char **argv)
 {
-    int i;
-    int length;
-    long result;
-    char *eptr;
-
     // init dictionary only once$
     if (SUBSCRIBER_DICT==NULL){
       SUBSCRIBER_DICT = *dictAlloc();