From bc46f899d083c47296dde2ce3dcf68e4d19082f3 Mon Sep 17 00:00:00 2001 From: gullradriel Date: Mon, 9 Feb 2026 21:33:50 +0100 Subject: [PATCH] change furi_assert to furi_check --- protopirate_app.c | 9 ++++----- protopirate_history.c | 24 ++++++++++++------------ 2 files changed, 16 insertions(+), 17 deletions(-) diff --git a/protopirate_app.c b/protopirate_app.c index c431bd7..9c97945 100644 --- a/protopirate_app.c +++ b/protopirate_app.c @@ -13,19 +13,19 @@ #define LOG_HEAP(msg) FURI_LOG_I(TAG, "%s - Free heap: %zu", msg, memmgr_get_free_heap()) static bool protopirate_app_custom_event_callback(void* context, uint32_t event) { - furi_assert(context); + furi_check(context); ProtoPirateApp* app = context; return scene_manager_handle_custom_event(app->scene_manager, event); } static bool protopirate_app_back_event_callback(void* context) { - furi_assert(context); + furi_check(context); ProtoPirateApp* app = context; return scene_manager_handle_back_event(app->scene_manager); } static void protopirate_app_tick_event_callback(void* context) { - furi_assert(context); + furi_check(context); ProtoPirateApp* app = context; scene_manager_handle_tick_event(app->scene_manager); } @@ -372,8 +372,7 @@ void protopirate_radio_deinit(ProtoPirateApp* app) { } void protopirate_app_free(ProtoPirateApp* app) { - if(!app) return; - furi_assert(app); + furi_check(app); FURI_LOG_I(TAG, "=== protopirate_app_free called ==="); FURI_LOG_D(TAG, "State: radio_initialized=%d", app->radio_initialized); diff --git a/protopirate_history.c b/protopirate_history.c index aebf3cc..6833ca3 100644 --- a/protopirate_history.c +++ b/protopirate_history.c @@ -23,7 +23,7 @@ struct ProtoPirateHistory { ProtoPirateHistory* protopirate_history_alloc(void) { ProtoPirateHistory* instance = malloc(sizeof(ProtoPirateHistory)); - furi_assert(instance); + furi_check(instance); ProtoPirateHistoryItemArray_init(instance->data); instance->last_index = 0; instance->last_update_timestamp = 0; @@ -32,7 +32,7 @@ ProtoPirateHistory* protopirate_history_alloc(void) { } void protopirate_history_free(ProtoPirateHistory* instance) { - furi_assert(instance); + furi_check(instance); for(size_t i = 0; i < ProtoPirateHistoryItemArray_size(instance->data); i++) { ProtoPirateHistoryItem* item = ProtoPirateHistoryItemArray_get(instance->data, i); furi_string_free(item->item_str); @@ -49,7 +49,7 @@ void protopirate_history_free(ProtoPirateHistory* instance) { } void protopirate_history_reset(ProtoPirateHistory* instance) { - furi_assert(instance); + furi_check(instance); for(size_t i = 0; i < ProtoPirateHistoryItemArray_size(instance->data); i++) { ProtoPirateHistoryItem* item = ProtoPirateHistoryItemArray_get(instance->data, i); furi_string_free(item->item_str); @@ -66,12 +66,12 @@ void protopirate_history_reset(ProtoPirateHistory* instance) { } uint16_t protopirate_history_get_item(ProtoPirateHistory* instance) { - furi_assert(instance); + furi_check(instance); return ProtoPirateHistoryItemArray_size(instance->data); } uint16_t protopirate_history_get_last_index(ProtoPirateHistory* instance) { - furi_assert(instance); + furi_check(instance); return instance->last_index; } @@ -98,8 +98,8 @@ bool protopirate_history_add_to_history( ProtoPirateHistory* instance, void* context, SubGhzRadioPreset* preset) { - furi_assert(instance); - furi_assert(context); + furi_check(instance); + furi_check(context); SubGhzProtocolDecoderBase* decoder_base = context; @@ -180,8 +180,8 @@ void protopirate_history_get_text_item_menu( ProtoPirateHistory* instance, FuriString* output, uint16_t idx) { - furi_assert(instance); - furi_assert(output); + furi_check(instance); + furi_check(output); if(idx >= ProtoPirateHistoryItemArray_size(instance->data)) { furi_string_set(output, "---"); @@ -214,8 +214,8 @@ void protopirate_history_get_text_item( ProtoPirateHistory* instance, FuriString* output, uint16_t idx) { - furi_assert(instance); - furi_assert(output); + furi_check(instance); + furi_check(output); if(idx >= ProtoPirateHistoryItemArray_size(instance->data)) { furi_string_set(output, "---"); @@ -234,7 +234,7 @@ SubGhzProtocolDecoderBase* } FlipperFormat* protopirate_history_get_raw_data(ProtoPirateHistory* instance, uint16_t idx) { - furi_assert(instance); + furi_check(instance); if(idx >= ProtoPirateHistoryItemArray_size(instance->data)) { return NULL;