🚨 Fix C++ sign/cast warnings, unused variables

paulreimer · paulreimer · commit 9653d648e7da · 2019-09-14T21:06:12.000-07:00
diff --git a/actor_model/src/actor.cpp b/actor_model/src/actor.cpp
@@ -81,7 +81,7 @@ auto _actor_spawn(
   const ExecConfigCallback&& _exec_config_callback
 ) -> Pid
 {
-  auto&& actor_behaviour = (
+  auto&& behaviour = (
     [actor_behaviours{std::move(_actor_behaviours)}]
     (const Pid& pid, Mailbox& mailbox)
       -> ResultUnion
@@ -138,13 +138,13 @@ auto _actor_spawn(
   {
     return node.spawn_link(
       *(_initial_link_pid),
-      actor_behaviour,
+      behaviour,
       std::move(_exec_config_callback)
     );
   }
   else {
     return node.spawn(
-      actor_behaviour,
+      behaviour,
       std::move(_exec_config_callback)
     );
   }
diff --git a/actor_model/src/mailbox.cpp b/actor_model/src/mailbox.cpp
@@ -190,10 +190,10 @@ auto Mailbox::receive(bool verify)
   if (impl)
   {
     // Extract an item from the ringbuffer
-    size_t size = -1;
+    size_t size = std::numeric_limits<size_t>::max();
     auto* flatbuf = xRingbufferReceive(impl, &size, receive_timeout_ticks);
 
-    if (flatbuf and size != -1)
+    if (flatbuf and size != std::numeric_limits<size_t>::max())
     {
       if (xSemaphoreTake(receive_semaphore, receive_lock_timeout_ticks) == pdTRUE)
       {
@@ -230,10 +230,10 @@ auto Mailbox::receive_raw()
   if (impl)
   {
     // Extract an item from the ringbuffer
-    size_t size = -1;
+    size_t size = std::numeric_limits<size_t>::max();
     auto* flatbuf = xRingbufferReceive(impl, &size, receive_timeout_ticks);
 
-    if (flatbuf and size != -1)
+    if (flatbuf and size != std::numeric_limits<size_t>::max())
     {
       message = string_view{reinterpret_cast<char*>(flatbuf), size};
     }
diff --git a/actor_model/src/oom_killer_actor_behaviour.cpp b/actor_model/src/oom_killer_actor_behaviour.cpp
@@ -66,15 +66,18 @@ auto oom_killer_actor_behaviour(
 
     UBaseType_t tcb_sz;
 
-    auto _num_tasks = uxTaskGetSnapshotAll(
+    uxTaskGetSnapshotAll(
       &stack_task_totals[0],
       stack_task_totals.size(),
       &tcb_sz
     );
 
     for (auto& total : stack_task_totals)
     {
-      auto len = (uint32_t)total.pxEndOfStack - (uint32_t)total.pxTopOfStack;
+      auto len = (
+        reinterpret_cast<uint32_t>(total.pxEndOfStack)
+        - reinterpret_cast<uint32_t>(total.pxTopOfStack)
+      );
       tasks_mem_info[total.pxTCB].stack_usage_bytes = len;
     }
 
diff --git a/firmware_update/src/firmware_update.cpp b/firmware_update/src/firmware_update.cpp
@@ -13,8 +13,8 @@
 #include <string>
 #include <vector>
 
-#include "esp_system.h"
 #include "esp_partition.h"
+#include "esp_system.h"
 #include "mbedtls/md5.h"
 
 namespace FirmwareUpdate {
@@ -101,7 +101,7 @@ auto checksum_partition_md5(
   mbedtls_md5_init(&ctx);
   mbedtls_md5_starts(&ctx);
 
-  for (auto offset = 0; offset < partition_size; offset += buffer_size)
+  for (auto offset = 0U; offset < partition_size; offset += buffer_size)
   {
     auto bytes_to_read = (
       ((offset + buffer_size) <= partition_size)?
@@ -151,10 +151,10 @@ auto checksum_file_md5(
     mbedtls_md5_init(&ctx);
     mbedtls_md5_starts(&ctx);
 
-    for (auto offset = 0; offset < file_size; offset += buffer_size)
+    for (auto offset = 0L; offset < file_size; offset += buffer_size)
     {
       auto bytes_to_read = (
-        ((offset + buffer_size) <= file_size)?
+        (static_cast<ssize_t>(offset + buffer_size) <= file_size)?
         buffer_size : (file_size - offset)
       );
 
@@ -189,7 +189,7 @@ auto get_md5sum_hex_str(const MD5Sum& md5sum)
 {
   std::string md5sum_hex_str(md5sum.size() * 2, 0);
 
-  for (auto i = 0; i < md5sum.size(); i++)
+  for (auto i = 0U; i < md5sum.size(); i++)
   {
     sprintf(&md5sum_hex_str[i*2], "%02x", md5sum[i]);
   }
diff --git a/firmware_update/src/firmware_update_actor.cpp b/firmware_update/src/firmware_update_actor.cpp
@@ -161,7 +161,12 @@ auto firmware_update_actor_behaviour(
         "Invalid FirmwareMetadata buffer received,  HTTP response code %d",
         response->code()
       );
-      ESP_LOG_BUFFER_HEXDUMP("response_finished", response->body()->data(), response->body()->size(), ESP_LOG_WARN);
+      ESP_LOG_BUFFER_HEXDUMP(
+        "response_finished",
+        response->body()->data(),
+        static_cast<uint16_t>(response->body()->size()),
+        ESP_LOG_WARN
+      );
     }
 
     state.firmware_update_check_request_in_progress = false;
diff --git a/googleapis/src/visualization_query_actor.cpp b/googleapis/src/visualization_query_actor.cpp
@@ -493,7 +493,7 @@ auto visualization_query_actor_behaviour(
                 send(self, "update_columns", pending_query_intent_mutable_buf);
 
                 // Extract the spreadsheet/sheet ids for the query
-                const auto* query_intent = flatbuffers::GetRoot<QueryIntent>(
+                query_intent = flatbuffers::GetRoot<QueryIntent>(
                   pending_query_intent_mutable_buf.data()
                 );
                 state.spreadsheet_column_ids_key = make_pair(
diff --git a/http_server/src/http_server_actor.cpp b/http_server/src/http_server_actor.cpp
@@ -103,7 +103,7 @@ auto http_server_actor_behaviour(
           state.sock_addr.sin_port = htons(http_server_config->port());
           auto ret = bind(
             state.sockfd,
-            (struct sockaddr*)&state.sock_addr,
+            reinterpret_cast<struct sockaddr*>(&state.sock_addr),
             sizeof(state.sock_addr)
           );
 
@@ -121,7 +121,6 @@ auto http_server_actor_behaviour(
               ret = listen(state.sockfd, 32);
               if (ret == 0)
               {
-                socklen_t addr_len = 0;
                 ESP_LOGI(TAG, "OK");
                 if (not state.tick_timer_ref)
                 {
@@ -185,7 +184,7 @@ auto http_server_actor_behaviour(
         socklen_t addr_len = 0;
         state.client_sockfd = accept(
           state.sockfd,
-          (struct sockaddr *)&state.sock_addr,
+          reinterpret_cast<struct sockaddr *>(&state.sock_addr),
           &addr_len
         );
 
diff --git a/jwt/src/jwt.cpp b/jwt/src/jwt.cpp
@@ -26,17 +26,17 @@ auto esp32_gen_random_bytes(void *ctx, unsigned char *buf, size_t len)
 auto esp32_gen_random_bytes(void *ctx, unsigned char *buf, size_t len)
   -> int
 {
-  auto i = 0;
+  auto i = 0U;
   // Fill up the buffer 32-bits at a time (4 chars each gen)
-  for (auto off=0; off<len; off+=4)
+  for (auto off=0U; off<len; off+=4)
   {
     // Get 32-bits of random from esp32 H/W RNG
     uint32_t r = esp_random();
 
-    if (i<=len) { buf[i++] = (r >>  0) & 0xff; }
-    if (i<=len) { buf[i++] = (r >>  8) & 0xff; }
-    if (i<=len) { buf[i++] = (r >> 16) & 0xff; }
-    if (i<=len) { buf[i++] = (r >> 24) & 0xff; }
+    if (i<=len) { buf[i++] = static_cast<uint8_t>(r >>  0); }
+    if (i<=len) { buf[i++] = static_cast<uint8_t>(r >>  8); }
+    if (i<=len) { buf[i++] = static_cast<uint8_t>(r >> 16); }
+    if (i<=len) { buf[i++] = static_cast<uint8_t>(r >> 24); }
   }
 
   return 0;
diff --git a/module_manager/src/file_buffer_loader.cpp b/module_manager/src/file_buffer_loader.cpp
@@ -64,7 +64,7 @@ auto FileBufferLoader::load(const off_t offset, const size_t size)
 
   if (file != nullptr)
   {
-    auto in_range = ((offset + size) <= file_len);
+    auto in_range = ((offset + static_cast<ssize_t>(size)) <= file_len);
     if (in_range)
     {
       const auto key = std::make_pair(offset, size);
@@ -88,7 +88,7 @@ auto FileBufferLoader::load(const off_t offset, const size_t size)
           file
         );
 
-        if (bytes_read == size)
+        if (bytes_read == static_cast<ssize_t>(size))
         {
           loaded_block = new_block.first;
         }
diff --git a/module_manager/src/file_buffer_loader.h b/module_manager/src/file_buffer_loader.h
@@ -12,8 +12,8 @@
 
 #include "elf/elf++.hh"
 
-#include <string_view>
 #include <string>
+#include <string_view>
 #include <unordered_map>
 
 namespace ModuleManager {
@@ -27,7 +27,7 @@ class FileBufferLoader
   virtual ~FileBufferLoader();
 
   auto load(const off_t offset, const size_t size)
-    -> const void*;
+    -> const void* override;
   auto extract(const off_t offset, const size_t size)
     -> void*;
 
diff --git a/module_manager/src/loader.cpp b/module_manager/src/loader.cpp
@@ -164,7 +164,6 @@ auto Loader::apply_relocs(const elf::elf& parsed_elf, Executable& executable)
     auto& rela_dyn = parsed_elf.get_section(".rela.dyn");
     auto& rela_plt = parsed_elf.get_section(".rela.plt");
 
-    auto& text = parsed_elf.get_section(".text");
 
     const auto& executable_segment = parsed_elf.get_segment(
       executable.executable_segment_idx
@@ -304,7 +303,7 @@ auto Loader::_apply_relocs_for_section(
         const auto& symtab = dynsym.as_symtab();
         auto symbol_index = reloc.info.symtab_index;
 
-        auto i = 0;
+        auto i = 0U;
         for (const auto& sym : symtab)
         {
           if (i++ == symbol_index)
diff --git a/module_manager/src/string_view_buffer_loader.h b/module_manager/src/string_view_buffer_loader.h
@@ -23,7 +23,7 @@ class StringViewBufferLoader
 public:
   explicit StringViewBufferLoader(const std::string_view _buffer);
   auto load(const off_t offset, const size_t size)
-    -> const void*;
+    -> const void* override;
 };
 
 } // namespace ModuleManager
diff --git a/mqtt_client/src/mqtt_client_actor.cpp b/mqtt_client/src/mqtt_client_actor.cpp
@@ -65,10 +65,8 @@ extern "C"
 auto _mqtt_event_handler(esp_mqtt_event_handle_t event)
   -> esp_err_t
 {
-  esp_mqtt_client_handle_t client = event->client;
   Pid& self = *(static_cast<Pid*>(event->user_context));
 
-  int msg_id;
   // your_context_t *context = event->context;
   switch (event->event_id) {
     case MQTT_EVENT_CONNECTED:
@@ -344,7 +342,6 @@ auto mqtt_client_actor_behaviour(
         const auto* nested_buf : *(mqtt_client_config->subscriptions())
       )
       {
-        const auto* s = nested_buf->subscription_nested_root();
         const auto* subscription = nested_buf->subscription();
         send(self, "subscribe", *(subscription));
       }
diff --git a/network_manager/src/network_check_actor.cpp b/network_manager/src/network_check_actor.cpp
@@ -37,7 +37,7 @@ auto ping_result_callback(ping_target_id_t msg_type, esp_ping_found* pf)
 {
   printf(
     "AvgTime:%.1fmS Sent:%d Rec:%d Err:%d min(mS):%d max(mS):%d ",
-    (float)pf->total_time/(float)pf->recv_count,
+    static_cast<float>(pf->total_time) / static_cast<float>(pf->recv_count),
     pf->send_count,
     pf->recv_count,
     pf->err_count,
@@ -94,8 +94,12 @@ auto network_check_actor_behaviour(
       if (network_details.gw.addr)
       {
         uint32_t _cnt = state.ping_count;
-        uint32_t _timeout = std::chrono::milliseconds(ping_timeout).count();
-        uint32_t _delay = std::chrono::milliseconds(ping_delay).count();
+        auto _timeout = static_cast<uint32_t>(
+          std::chrono::milliseconds(ping_timeout).count()
+        );
+        uint32_t _delay = static_cast<uint32_t>(
+          std::chrono::milliseconds(ping_delay).count()
+        );
         uint32_t _addr = network_details.gw.addr;
         void* _fn = (void*)&ping_result_callback;
 
diff --git a/network_manager/src/network_manager.cpp b/network_manager/src/network_manager.cpp
@@ -67,7 +67,7 @@ auto get_wifi_connection_rssi(const size_t samples)
 
   auto interval = 25ms;
 
-  for (auto i = 0; i < samples; ++i)
+  for (auto i = 0U; i < samples; ++i)
   {
     if (esp_wifi_sta_get_ap_info(&current_ap_info) == 0)
     {
diff --git a/network_manager/src/wifi_actor.cpp b/network_manager/src/wifi_actor.cpp
@@ -12,7 +12,7 @@
 
 #include "network_manager.h"
 
-#include "esp_event_loop.h"
+#include "esp_event.h"
 #include "esp_log.h"
 #include "esp_system.h"
 #include "esp_wifi.h"
@@ -47,7 +47,7 @@ auto wifi_actor_behaviour(
     {
       // Check for existing config (e.g. stored in NVS)
       wifi_config_t existing_wifi_config = {};
-      auto ret = esp_wifi_get_config(ESP_IF_WIFI_STA, &existing_wifi_config);
+      ret = esp_wifi_get_config(ESP_IF_WIFI_STA, &existing_wifi_config);
 
       if (
         ret != ESP_OK
diff --git a/requests/src/http_utils.cpp b/requests/src/http_utils.cpp
@@ -55,7 +55,7 @@ auto parse_http_status_line(const string_view chunk)
     // Decode the extracted HTTP response code as an unsigned int
     code = 0;
 
-    auto i = 0;
+    auto i = 0U;
     for (; i<remaining.size(); ++i)
     {
       auto num = remaining[i] - '0';
@@ -114,8 +114,11 @@ auto urlencode(const std::string_view raw_str)
     for (const auto& c : raw_str)
     {
       auto safe = is_char_url_safe(c);
-      auto tag = (safe? "%c" : "%%%02X");
-      auto written_count = sprintf(&encoded_str[write_offset], tag, c);
+      auto written_count = sprintf(
+        &encoded_str[write_offset],
+        safe? "%c" : "%%%02X",
+        c
+      );
       write_offset += written_count;
     }
   }
diff --git a/requests/src/request_handler.cpp b/requests/src/request_handler.cpp
@@ -398,7 +398,7 @@ auto RequestHandler::header_callback(const string_view chunk)
     if (_code)
     {
       // Assign the parsed status code to this response object
-      response_code = _code;
+      response_code = static_cast<uint16_t>(_code);
 
       // Print the received status code
       auto status = chunk;
diff --git a/requests/src/request_manager.cpp b/requests/src/request_manager.cpp
@@ -723,7 +723,7 @@ auto RequestManager::add_cacert_pem(const string_view cacert_pem)
     // Parse the PEM text
     auto ret = mbedtls_x509_crt_parse(
       _cacerts,
-      (unsigned char*)cacert_pem.data(),
+      reinterpret_cast<const unsigned char*>(cacert_pem.data()),
       cacert_pem.size()
     );
 
@@ -765,7 +765,7 @@ auto RequestManager::add_cacert_der(const string_view cacert_der)
   // Parse the DER content
   auto ret = mbedtls_x509_crt_parse_der(
     _cacerts,
-    (unsigned char*)cacert_der.data(),
+    reinterpret_cast<const unsigned char*>(cacert_der.data()),
     cacert_der.size()
   );
 
@@ -815,11 +815,11 @@ auto RequestManager::get_existing_request_handler(const UUID* request_intent_id)
 {
   auto handler_iter = std::find_if(requests.begin(), requests.end(),
     [&request_intent_id]
-    (const auto& handler_iter) -> bool
+    (const auto& check_iter) -> bool
     {
       return (
         compare_uuids(
-          *(handler_iter.second.request_intent->id()),
+          *(check_iter.second.request_intent->id()),
           *(request_intent_id)
         )
       );
diff --git a/requests/src/server_sent_events_emitter.cpp b/requests/src/server_sent_events_emitter.cpp
@@ -47,7 +47,6 @@ auto ServerSentEventsEmitter::parse(
       bool event_valid = false;
       flatbuffers::Offset<flatbuffers::String> data_fbstr = 0;
       bool data_valid = false;
-      int32_t retry = 0;
 
       auto line_start = 0;
       // One leading U+FEFF BYTE ORDER MARK character must be ignored
diff --git a/statsd/src/timing_metric.cpp b/statsd/src/timing_metric.cpp
diff --git a/statsd/src/timing_metric.h b/statsd/src/timing_metric.h
diff --git a/utils/src/delay.h b/utils/src/delay.h

Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ auto _actor_spawn(`
`81`	`81`	`const ExecConfigCallback&& _exec_config_callback`
`82`	`82`	`) -> Pid`
`83`	`83`	`{`
`84`		`- auto&& actor_behaviour = (`
	`84`	`+ auto&& behaviour = (`
`85`	`85`	`[actor_behaviours{std::move(_actor_behaviours)}]`
`86`	`86`	`(const Pid& pid, Mailbox& mailbox)`
`87`	`87`	`-> ResultUnion`
`@@ -138,13 +138,13 @@ auto _actor_spawn(`
`138`	`138`	`{`
`139`	`139`	`return node.spawn_link(`
`140`	`140`	`*(_initial_link_pid),`
`141`		`- actor_behaviour,`
	`141`	`+ behaviour,`
`142`	`142`	`std::move(_exec_config_callback)`
`143`	`143`	`);`
`144`	`144`	`}`
`145`	`145`	`else {`
`146`	`146`	`return node.spawn(`
`147`		`- actor_behaviour,`
	`147`	`+ behaviour,`
`148`	`148`	`std::move(_exec_config_callback)`
`149`	`149`	`);`
`150`	`150`	`}`
Original file line number	Diff line number	Diff line change
`@@ -190,10 +190,10 @@ auto Mailbox::receive(bool verify)`
`190`	`190`	`if (impl)`
`191`	`191`	`{`
`192`	`192`	`// Extract an item from the ringbuffer`
`193`		`- size_t size = -1;`
	`193`	`+ size_t size = std::numeric_limits<size_t>::max();`
`194`	`194`	`auto* flatbuf = xRingbufferReceive(impl, &size, receive_timeout_ticks);`
`195`	`195`
`196`		`- if (flatbuf and size != -1)`
	`196`	`+ if (flatbuf and size != std::numeric_limits<size_t>::max())`
`197`	`197`	`{`
`198`	`198`	`if (xSemaphoreTake(receive_semaphore, receive_lock_timeout_ticks) == pdTRUE)`
`199`	`199`	`{`
`@@ -230,10 +230,10 @@ auto Mailbox::receive_raw()`
`230`	`230`	`if (impl)`
`231`	`231`	`{`
`232`	`232`	`// Extract an item from the ringbuffer`
`233`		`- size_t size = -1;`
	`233`	`+ size_t size = std::numeric_limits<size_t>::max();`
`234`	`234`	`auto* flatbuf = xRingbufferReceive(impl, &size, receive_timeout_ticks);`
`235`	`235`
`236`		`- if (flatbuf and size != -1)`
	`236`	`+ if (flatbuf and size != std::numeric_limits<size_t>::max())`
`237`	`237`	`{`
`238`	`238`	`message = string_view{reinterpret_cast<char*>(flatbuf), size};`
`239`	`239`	`}`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ auto FileBufferLoader::load(const off_t offset, const size_t size)`
`64`	`64`
`65`	`65`	`if (file != nullptr)`
`66`	`66`	`{`
`67`		`- auto in_range = ((offset + size) <= file_len);`
	`67`	`+ auto in_range = ((offset + static_cast<ssize_t>(size)) <= file_len);`
`68`	`68`	`if (in_range)`
`69`	`69`	`{`
`70`	`70`	`const auto key = std::make_pair(offset, size);`
`@@ -88,7 +88,7 @@ auto FileBufferLoader::load(const off_t offset, const size_t size)`
`88`	`88`	`file`
`89`	`89`	`);`
`90`	`90`
`91`		`- if (bytes_read == size)`
	`91`	`+ if (bytes_read == static_cast<ssize_t>(size))`
`92`	`92`	`{`
`93`	`93`	`loaded_block = new_block.first;`
`94`	`94`	`}`