Merge pull request #434 from wqx6/network_prov/fix_unused_warning

fix(network_prov): Fix warning of unused_function or unused_variable (IEC-227)
espressif · Nov 11, 2024 · d3e5a00 · d3e5a00
2 parents 884934d + 0b2454b
commit d3e5a00
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/network_provisioning/idf_component.yml b/network_provisioning/idf_component.yml
@@ -1,4 +1,4 @@
-version: "1.0.2"
+version: "1.0.3"
 description: Network provisioning component for Wi-Fi or Thread devices
 url: https://github.com/espressif/idf-extra-components/tree/master/network_provisioning
 dependencies:

diff --git a/network_provisioning/src/handlers.c b/network_provisioning/src/handlers.c
@@ -23,6 +23,7 @@
 #include "network_provisioning/manager.h"
 #include "network_provisioning_priv.h"
 
+#if defined(CONFIG_NETWORK_PROV_NETWORK_TYPE_WIFI) || defined(CONFIG_NETWORK_PROV_NETWORK_TYPE_THREAD)
 static const char *TAG = "network_prov_handlers";
 
 /* Provide definition of network_prov_ctx_t */
@@ -40,6 +41,7 @@ static void free_network_prov_ctx(network_prov_ctx_t **ctx)
     free(*ctx);
     *ctx = NULL;
 }
+#endif
 
 #ifdef CONFIG_NETWORK_PROV_NETWORK_TYPE_WIFI
 static wifi_config_t *get_wifi_config(network_prov_ctx_t **ctx)

diff --git a/network_provisioning/src/network_scan.c b/network_provisioning/src/network_scan.c
@@ -65,7 +65,7 @@ static esp_err_t cmd_scan_start_handler(NetworkScanPayload *req,
                                         NetworkScanPayload *resp, void *priv_data)
 {
     network_prov_scan_handlers_t *h = (network_prov_scan_handlers_t *) priv_data;
-    if (!priv_data) {
+    if (!h) {
         ESP_LOGE(TAG, "Command invoked without handlers");
         return ESP_ERR_INVALID_STATE;
     }
@@ -175,9 +175,9 @@ static esp_err_t cmd_scan_status_handler(NetworkScanPayload *req,
 static esp_err_t cmd_scan_result_handler(NetworkScanPayload *req,
         NetworkScanPayload *resp, void *priv_data)
 {
-    esp_err_t err;
+    esp_err_t err = ESP_OK;
     network_prov_scan_handlers_t *h = (network_prov_scan_handlers_t *) priv_data;
-    if (!priv_data) {
+    if (!h) {
         ESP_LOGE(TAG, "Command invoked without handlers");
         return ESP_ERR_INVALID_STATE;
     }
@@ -328,9 +328,10 @@ static esp_err_t cmd_scan_result_handler(NetworkScanPayload *req,
         }
 #else // CONFIG_NETWORK_PROV_NETWORK_TYPE_THREAD
         resp->status = STATUS__InvalidArgument;
+        err = ESP_ERR_INVALID_ARG;
 #endif // !CONFIG_NETWORK_PROV_NETWORK_TYPE_THREAD
     }
-    return ESP_OK;
+    return err;
 }