Fixes for toolchain 28 / gcc 12

Flipper-XFW · Feb 12, 2024 · 374a30a · 374a30a
1 parent d6cc186
commit 374a30a
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/applications/drivers/subghz/cc1101_ext/cc1101_ext.c b/applications/drivers/subghz/cc1101_ext/cc1101_ext.c
@@ -252,7 +252,6 @@ void subghz_device_cc1101_ext_free() {
     furi_assert(subghz_device_cc1101_ext != NULL);
 
     furi_hal_spi_bus_handle_deinit(subghz_device_cc1101_ext->spi_bus_handle);
-    free(subghz_device_cc1101_ext);
 
     // resetting the CS pins to floating
     if(xtreme_settings.spi_nrf24_handle == SpiDefault || subghz_device_cc1101_ext->power_amp) {
@@ -261,6 +260,7 @@ void subghz_device_cc1101_ext_free() {
         furi_hal_gpio_init_simple(&gpio_ext_pa4, GpioModeAnalog);
     }
 
+    free(subghz_device_cc1101_ext);
     subghz_device_cc1101_ext = NULL;
 }
 

diff --git a/applications/external b/applications/external
diff --git a/applications/main/xtreme_app/xtreme_app.c b/applications/main/xtreme_app/xtreme_app.c
@@ -48,15 +48,15 @@ bool xtreme_app_apply(XtremeApp* app) {
             while(flipper_format_delete_key(file, "Frequency"))
                 ;
             FrequencyList_it(it, app->subghz_static_freqs);
-            for(uint i = 0; i < FrequencyList_size(app->subghz_static_freqs); i++) {
+            for(size_t i = 0; i < FrequencyList_size(app->subghz_static_freqs); i++) {
                 flipper_format_write_uint32(
                     file, "Frequency", FrequencyList_get(app->subghz_static_freqs, i), 1);
             }
 
             if(!flipper_format_rewind(file)) break;
             while(flipper_format_delete_key(file, "Hopper_frequency"))
                 ;
-            for(uint i = 0; i < FrequencyList_size(app->subghz_hopper_freqs); i++) {
+            for(size_t i = 0; i < FrequencyList_size(app->subghz_hopper_freqs); i++) {
                 flipper_format_write_uint32(
                     file, "Hopper_frequency", FrequencyList_get(app->subghz_hopper_freqs, i), 1);
             }

diff --git a/applications/services/desktop/views/desktop_view_lock_menu.c b/applications/services/desktop/views/desktop_view_lock_menu.c
@@ -68,11 +68,11 @@ void desktop_lock_menu_draw_callback(Canvas* canvas, void* model) {
     canvas_set_color(canvas, ColorBlack);
     canvas_set_font(canvas, FontBatteryPercent);
 
-    int x, y, w, h;
+    int8_t x, y, w, h;
     bool selected, toggle;
     bool enabled = false;
-    uint value = 0;
-    int total = 58;
+    uint8_t value = 0;
+    int8_t total = 58;
     const Icon* icon = NULL;
     for(size_t i = 0; i < DesktopLockMenuIndexTotalCount; ++i) {
         selected = m->idx == i;

diff --git a/applications/settings/storage_settings/scenes/storage_settings_scene_sd_info.c b/applications/settings/storage_settings/scenes/storage_settings_scene_sd_info.c
@@ -28,7 +28,7 @@ void storage_settings_scene_sd_info_on_enter(void* context) {
         double total_v = (double)sd_info.kb_total;
         double free_v = (double)sd_info.kb_free;
         char* units[] = {"KiB", "MiB", "GiB", "TiB"};
-        uint total_i, free_i;
+        uint8_t total_i, free_i;
         for(total_i = 0; total_i < COUNT_OF(units); total_i++) {
             if(total_v < 1024) break;
             total_v /= 1024;