Merge pull request #738 from galenguyer/develop

Multiple CMake fixes and version updates to resolve compiler warnings

2 files changed, 9 insertions, 9 deletions

diff --git a/plugins/broadcastify_uploader/broadcastify_uploader.cc b/plugins/broadcastify_uploader/broadcastify_uploader.cc
index 3b3fe553..350b5c73 100644
--- a/plugins/broadcastify_uploader/broadcastify_uploader.cc
+++ b/plugins/broadcastify_uploader/broadcastify_uploader.cc
@@ -66,7 +66,7 @@ public:
     }
 
     CURL *curl;
-    CURLcode res;
+    CURLcode res = CURLE_FAILED_INIT;
 
     struct curl_slist *headers = NULL;
 
diff --git a/plugins/unit_script/unit_script.cc b/plugins/unit_script/unit_script.cc
index 43fd5355..1abca58a 100644
--- a/plugins/unit_script/unit_script.cc
+++ b/plugins/unit_script/unit_script.cc
@@ -28,7 +28,7 @@ int unit_registration(System *sys, long source_id) {
   if ((system_script != "") && (source_id != 0)) {
     char shell_command[200];
     sprintf(shell_command, "%s %s %li on &", system_script.c_str(), sys->get_short_name().c_str(), source_id);
-    int rc =  system(shell_command);
+    int rc __attribute__((unused)) =  system(shell_command);
     return 0;
   }
     return 1;
@@ -40,7 +40,7 @@ int unit_deregistration(System *sys, long source_id) {
   if ((system_script != "") && (source_id != 0)) {
     char shell_command[200];
     sprintf(shell_command, "%s %s %li off &", system_script.c_str(), sys->get_short_name().c_str(), source_id);
-    int rc =  system(shell_command);
+    int rc __attribute__((unused)) =  system(shell_command);
     return 0;
   }
     return 1;
@@ -50,7 +50,7 @@ int unit_acknowledge_response(System *sys, long source_id) {
   if ((system_script != "") && (source_id != 0)) {
     char shell_command[200];
     sprintf(shell_command, "%s %s %li ackresp &", system_script.c_str(), sys->get_short_name().c_str(), source_id);
-    int rc =  system(shell_command);
+    int rc __attribute__((unused)) =  system(shell_command);
     return 0;
   }
     return 1;
@@ -70,7 +70,7 @@ int unit_group_affiliation(System *sys, long source_id, long talkgroup_num) {
       patch_string += std::to_string(TGID);
     }
     sprintf(shell_command, "%s %s %li join %li %s &", system_script.c_str(), sys->get_short_name().c_str(), source_id, talkgroup_num, patch_string.c_str());
-    int rc =  system(shell_command);
+    int rc __attribute__((unused)) =  system(shell_command);
     return 0;
   }
     return 1;
@@ -81,7 +81,7 @@ int unit_data_grant(System *sys, long source_id) {
   if ((system_script != "") && (source_id != 0)) {
     char shell_command[200];
     sprintf(shell_command, "%s %s %li data &", system_script.c_str(), sys->get_short_name().c_str(), source_id);
-    int rc =  system(shell_command);
+    int rc __attribute__((unused)) =  system(shell_command);
     return 0;
   }
     return 1;
@@ -92,7 +92,7 @@ int unit_answer_request(System *sys, long source_id, long talkgroup) {
   if ((system_script != "") && (source_id != 0)) {
     char shell_command[200];
     sprintf(shell_command, "%s %s %li ans_req %li &", system_script.c_str(), sys->get_short_name().c_str(), source_id, talkgroup);
-    int rc =  system(shell_command);
+    int rc __attribute__((unused)) =  system(shell_command);
     return 0;
   }
     return 1;
@@ -112,7 +112,7 @@ int unit_location(System *sys, long source_id, long talkgroup_num) {
       patch_string += std::to_string(TGID);
     }
     sprintf(shell_command, "%s %s %li location %li %s &", system_script.c_str(), sys->get_short_name().c_str(), source_id, talkgroup_num, patch_string.c_str());
-    int rc =  system(shell_command);
+    int rc __attribute__((unused)) =  system(shell_command);
     return 0;
   }
     return 1;
@@ -134,7 +134,7 @@ int call_start(Call *call) {
       patch_string += std::to_string(TGID);
     }
     sprintf(shell_command, "%s %s %li call %li %s &", system_script.c_str(), short_name.c_str(), source_id, talkgroup_num, patch_string.c_str());
-    int rc =  system(shell_command);
+    int rc __attribute__((unused)) =  system(shell_command);
     return 0;
   }
     return 1;