From 53780e72ed296f7fa558075fdd2a22ca4612f021 Mon Sep 17 00:00:00 2001 From: Willy-JL Date: Mon, 13 Feb 2023 00:01:49 +0000 Subject: [PATCH] Misc sonarcloud fixes --- applications/main/bad_kb/bad_kb_script.c | 2 -- applications/plugins/protoview/view_settings.c | 2 +- .../plugins/spi_mem_manager/lib/spi/spi_mem_tools.c | 2 +- .../services/desktop/animations/animation_storage.c | 6 ++++-- scripts/fbt/appmanifest.py | 3 ++- 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/applications/main/bad_kb/bad_kb_script.c b/applications/main/bad_kb/bad_kb_script.c index 98177209e..e2fd464ff 100644 --- a/applications/main/bad_kb/bad_kb_script.c +++ b/applications/main/bad_kb/bad_kb_script.c @@ -595,8 +595,6 @@ static int32_t ducky_script_execute_next(BadKbScript* bad_kb, File* script_file) bad_kb->buf_len = 0; if(bad_kb->file_end) return SCRIPT_STATE_END; } - - return 0; } static void bad_kb_bt_hid_state_callback(BtStatus status, void* context) { diff --git a/applications/plugins/protoview/view_settings.c b/applications/plugins/protoview/view_settings.c index 09abf5a2a..94d80cfb5 100644 --- a/applications/plugins/protoview/view_settings.c +++ b/applications/plugins/protoview/view_settings.c @@ -88,7 +88,7 @@ void process_input_settings(ProtoViewApp* app, InputEvent input) { if(input.key == InputKeyUp) { modid = modid == 0 ? count - 1 : modid - 1; } else if(input.key == InputKeyDown) { - modid = (modid + 1) % count; + modid = (modid + 1) % (count ? count : 1); } else { return; } diff --git a/applications/plugins/spi_mem_manager/lib/spi/spi_mem_tools.c b/applications/plugins/spi_mem_manager/lib/spi/spi_mem_tools.c index 3518ca25c..7a788241b 100644 --- a/applications/plugins/spi_mem_manager/lib/spi/spi_mem_tools.c +++ b/applications/plugins/spi_mem_manager/lib/spi/spi_mem_tools.c @@ -74,8 +74,8 @@ bool spi_mem_tools_read_chip_info(SPIMemChip* chip) { bool spi_mem_tools_check_chip_info(SPIMemChip* chip) { SPIMemChip new_chip_info; - spi_mem_tools_read_chip_info(&new_chip_info); do { + if(!spi_mem_tools_read_chip_info(&new_chip_info)) break; if(chip->vendor_id != new_chip_info.vendor_id) break; if(chip->type_id != new_chip_info.type_id) break; if(chip->capacity_id != new_chip_info.capacity_id) break; diff --git a/applications/services/desktop/animations/animation_storage.c b/applications/services/desktop/animations/animation_storage.c index 4ac36762e..4808521a8 100644 --- a/applications/services/desktop/animations/animation_storage.c +++ b/applications/services/desktop/animations/animation_storage.c @@ -291,9 +291,10 @@ static void animation_storage_free_frames(BubbleAnimation* animation) { const Icon* icon = &animation->icon_animation; for(int i = 0; i < icon->frame_count; ++i) { - if(icon->frames[i]) { - free((void*)icon->frames[i]); + if(!icon->frames[i]) { + break; } + free((void*)icon->frames[i]); } free((void*)icon->frames); @@ -336,6 +337,7 @@ static bool animation_storage_load_frames( frames_ok = false; furi_string_printf(filename, "%s/%s/frame_%d.bm", ANIMATION_DIR, name, i); + FURI_CONST_ASSIGN_PTR(icon->frames[i], 0); if(storage_common_stat(storage, furi_string_get_cstr(filename), &file_info) != FSE_OK) break; if(file_info.size > max_filesize) { diff --git a/scripts/fbt/appmanifest.py b/scripts/fbt/appmanifest.py index 1c815c902..4f960de83 100644 --- a/scripts/fbt/appmanifest.py +++ b/scripts/fbt/appmanifest.py @@ -194,6 +194,8 @@ class AppBuildset: return self.appmgr.get(app_name).supports_hardware_target(self.hw_target) def _get_app_depends(self, app_name: str) -> List[str]: + app_def = self.appmgr.get(app_name) + # Skip app if its target is not supported by the target we are building for if not self._check_if_app_target_supported(app_name): self._writer( @@ -201,7 +203,6 @@ class AppBuildset: ) return [] - app_def = self.appmgr.get(app_name) return list( filter( self._check_if_app_target_supported,