Api Symbols: replace asserts with checks

merge ofw commit

applications/services/gui/canvas.c

@@ -14,7 +14,7 @@ const CanvasFontParameters canvas_font_params[FontTotalNumber] = {
     [FontBatteryPercent] = {.leading_default = 11, .leading_min = 9, .height = 6, .descender = 0},
 };
 
-Canvas* canvas_init() {
+Canvas* canvas_init(void) {
     Canvas* canvas = malloc(sizeof(Canvas));
     canvas->compress_icon = compress_icon_alloc();
 
@@ -40,7 +40,7 @@ Canvas* canvas_init() {
 }
 
 void canvas_free(Canvas* canvas) {
-    furi_assert(canvas);
+    furi_check(canvas);
     compress_icon_free(canvas->compress_icon);
     CanvasCallbackPairArray_clear(canvas->canvas_callback_pair);
     furi_mutex_free(canvas->mutex);
@@ -58,7 +58,7 @@ static void canvas_unlock(Canvas* canvas) {
 }
 
 void canvas_reset(Canvas* canvas) {
-    furi_assert(canvas);
+    furi_check(canvas);
 
     canvas_clear(canvas);
 
@@ -68,7 +68,7 @@ void canvas_reset(Canvas* canvas) {
 }
 
 void canvas_commit(Canvas* canvas) {
-    furi_assert(canvas);
+    furi_check(canvas);
     u8g2_SendBuffer(&canvas->fb);
 
     // Iterate over callbacks
@@ -85,12 +85,12 @@ void canvas_commit(Canvas* canvas) {
 }
 
 uint8_t* canvas_get_buffer(Canvas* canvas) {
-    furi_assert(canvas);
+    furi_check(canvas);
     return u8g2_GetBufferPtr(&canvas->fb);
 }
 
 size_t canvas_get_buffer_size(const Canvas* canvas) {
-    furi_assert(canvas);
+    furi_check(canvas);
     return u8g2_GetBufferTileWidth(&canvas->fb) * u8g2_GetBufferTileHeight(&canvas->fb) * 8;
 }
 
@@ -100,7 +100,7 @@ void canvas_frame_set(
     uint8_t offset_y,
     uint8_t width,
     uint8_t height) {
-    furi_assert(canvas);
+    furi_check(canvas);
     canvas->offset_x = offset_x;
     canvas->offset_y = offset_y;
     canvas->width = width;
@@ -108,17 +108,17 @@ void canvas_frame_set(
 }
 
 uint8_t canvas_width(const Canvas* canvas) {
-    furi_assert(canvas);
+    furi_check(canvas);
     return canvas->width;
 }
 
 uint8_t canvas_height(const Canvas* canvas) {
-    furi_assert(canvas);
+    furi_check(canvas);
     return canvas->height;
 }
 
 uint8_t canvas_current_font_height(const Canvas* canvas) {
-    furi_assert(canvas);
+    furi_check(canvas);
     uint8_t font_height = u8g2_GetMaxCharHeight(&canvas->fb);
 
     if(canvas->fb.font == u8g2_font_haxrcorp4089_tr) {
@@ -134,23 +134,23 @@ uint8_t canvas_current_font_width(const Canvas* canvas) {
 }
 
 const CanvasFontParameters* canvas_get_font_params(const Canvas* canvas, Font font) {
-    furi_assert(canvas);
-    furi_assert(font < FontTotalNumber);
+    furi_check(canvas);
+    furi_check(font < FontTotalNumber);
     return &canvas_font_params[font];
 }
 
 void canvas_clear(Canvas* canvas) {
-    furi_assert(canvas);
+    furi_check(canvas);
     u8g2_ClearBuffer(&canvas->fb);
 }
 
 void canvas_set_color(Canvas* canvas, Color color) {
-    furi_assert(canvas);
+    furi_check(canvas);
     u8g2_SetDrawColor(&canvas->fb, color);
 }
 
 void canvas_set_font_direction(Canvas* canvas, CanvasDirection dir) {
-    furi_assert(canvas);
+    furi_check(canvas);
     u8g2_SetFontDirection(&canvas->fb, dir);
 }
 
@@ -159,7 +159,7 @@ void canvas_invert_color(Canvas* canvas) {
 }
 
 void canvas_set_font(Canvas* canvas, Font font) {
-    furi_assert(canvas);
+    furi_check(canvas);
     u8g2_SetFontMode(&canvas->fb, 1);
     if(font == FontPrimary) {
         u8g2_SetFont(&canvas->fb, u8g2_font_helvB08_tr);
@@ -177,13 +177,13 @@ void canvas_set_font(Canvas* canvas, Font font) {
 }
 
 void canvas_set_custom_u8g2_font(Canvas* canvas, const uint8_t* font) {
-    furi_assert(canvas);
+    furi_check(canvas);
     u8g2_SetFontMode(&canvas->fb, 1);
     u8g2_SetFont(&canvas->fb, font);
 }
 
 void canvas_draw_str(Canvas* canvas, uint8_t x, uint8_t y, const char* str) {
-    furi_assert(canvas);
+    furi_check(canvas);
     if(!str) return;
     x += canvas->offset_x;
     y += canvas->offset_y;
@@ -197,7 +197,7 @@ void canvas_draw_str_aligned(
     Align horizontal,
     Align vertical,
     const char* str) {
-    furi_assert(canvas);
+    furi_check(canvas);
     if(!str) return;
     x += canvas->offset_x;
     y += canvas->offset_y;
@@ -234,13 +234,13 @@ void canvas_draw_str_aligned(
 }
 
 uint16_t canvas_string_width(Canvas* canvas, const char* str) {
-    furi_assert(canvas);
+    furi_check(canvas);
     if(!str) return 0;
     return u8g2_GetStrWidth(&canvas->fb, str);
 }
 
 uint8_t canvas_glyph_width(Canvas* canvas, uint16_t symbol) {
-    furi_assert(canvas);
+    furi_check(canvas);
     return u8g2_GetGlyphWidth(&canvas->fb, symbol);
 }
 
@@ -251,7 +251,7 @@ void canvas_draw_bitmap(
     uint8_t width,
     uint8_t height,
     const uint8_t* compressed_bitmap_data) {
-    furi_assert(canvas);
+    furi_check(canvas);
 
     x += canvas->offset_x;
     y += canvas->offset_y;
@@ -265,8 +265,8 @@ void canvas_draw_icon_animation(
     uint8_t x,
     uint8_t y,
     IconAnimation* icon_animation) {
-    furi_assert(canvas);
-    furi_assert(icon_animation);
+    furi_check(canvas);
+    furi_check(icon_animation);
 
     x += canvas->offset_x;
     y += canvas->offset_y;
@@ -364,10 +364,6 @@ void canvas_draw_u8g2_bitmap(
     u8g2_uint_t h,
     const uint8_t* bitmap,
     IconRotation rotation) {
-    u8g2_uint_t blen;
-    blen = w;
-    blen += 7;
-    blen >>= 3;
 #ifdef U8G2_WITH_INTERSECTION
     if(u8g2_IsIntersection(u8g2, x, y, x + w, y + h) == 0) return;
 #endif /* U8G2_WITH_INTERSECTION */
@@ -396,8 +392,8 @@ void canvas_draw_icon_ex(
     uint8_t y,
     const Icon* icon,
     IconRotation rotation) {
-    furi_assert(canvas);
-    furi_assert(icon);
+    furi_check(canvas);
+    furi_check(icon);
 
     x += canvas->offset_x;
     y += canvas->offset_y;
@@ -408,8 +404,8 @@ void canvas_draw_icon_ex(
 }
 
 void canvas_draw_icon(Canvas* canvas, uint8_t x, uint8_t y, const Icon* icon) {
-    furi_assert(canvas);
-    furi_assert(icon);
+    furi_check(canvas);
+    furi_check(icon);
 
     x += canvas->offset_x;
     y += canvas->offset_y;
@@ -420,14 +416,14 @@ void canvas_draw_icon(Canvas* canvas, uint8_t x, uint8_t y, const Icon* icon) {
 }
 
 void canvas_draw_dot(Canvas* canvas, uint8_t x, uint8_t y) {
-    furi_assert(canvas);
+    furi_check(canvas);
     x += canvas->offset_x;
     y += canvas->offset_y;
     u8g2_DrawPixel(&canvas->fb, x, y);
 }
 
 void canvas_draw_box(Canvas* canvas, uint8_t x, uint8_t y, uint8_t width, uint8_t height) {
-    furi_assert(canvas);
+    furi_check(canvas);
     x += canvas->offset_x;
     y += canvas->offset_y;
     u8g2_DrawBox(&canvas->fb, x, y, width, height);
@@ -440,14 +436,14 @@ void canvas_draw_rbox(
     uint8_t width,
     uint8_t height,
     uint8_t radius) {
-    furi_assert(canvas);
+    furi_check(canvas);
     x += canvas->offset_x;
     y += canvas->offset_y;
     u8g2_DrawRBox(&canvas->fb, x, y, width, height, radius);
 }
 
 void canvas_draw_frame(Canvas* canvas, uint8_t x, uint8_t y, uint8_t width, uint8_t height) {
-    furi_assert(canvas);
+    furi_check(canvas);
     x += canvas->offset_x;
     y += canvas->offset_y;
     u8g2_DrawFrame(&canvas->fb, x, y, width, height);
@@ -460,14 +456,14 @@ void canvas_draw_rframe(
     uint8_t width,
     uint8_t height,
     uint8_t radius) {
-    furi_assert(canvas);
+    furi_check(canvas);
     x += canvas->offset_x;
     y += canvas->offset_y;
     u8g2_DrawRFrame(&canvas->fb, x, y, width, height, radius);
 }
 
 void canvas_draw_line(Canvas* canvas, uint8_t x1, uint8_t y1, uint8_t x2, uint8_t y2) {
-    furi_assert(canvas);
+    furi_check(canvas);
     x1 += canvas->offset_x;
     y1 += canvas->offset_y;
     x2 += canvas->offset_x;
@@ -476,14 +472,14 @@ void canvas_draw_line(Canvas* canvas, uint8_t x1, uint8_t y1, uint8_t x2, uint8_
 }
 
 void canvas_draw_circle(Canvas* canvas, uint8_t x, uint8_t y, uint8_t radius) {
-    furi_assert(canvas);
+    furi_check(canvas);
     x += canvas->offset_x;
     y += canvas->offset_y;
     u8g2_DrawCircle(&canvas->fb, x, y, radius, U8G2_DRAW_ALL);
 }
 
 void canvas_draw_disc(Canvas* canvas, uint8_t x, uint8_t y, uint8_t radius) {
-    furi_assert(canvas);
+    furi_check(canvas);
     x += canvas->offset_x;
     y += canvas->offset_y;
     u8g2_DrawDisc(&canvas->fb, x, y, radius, U8G2_DRAW_ALL);
@@ -496,7 +492,7 @@ void canvas_draw_triangle(
     uint8_t base,
     uint8_t height,
     CanvasDirection dir) {
-    furi_assert(canvas);
+    furi_check(canvas);
     if(dir == CanvasDirectionBottomToTop) {
         canvas_draw_line(canvas, x - base / 2, y, x + base / 2, y);
         canvas_draw_line(canvas, x - base / 2, y, x, y - height + 1);
@@ -523,14 +519,14 @@ void canvas_draw_xbm(
     uint8_t w,
     uint8_t h,
     const uint8_t* bitmap) {
-    furi_assert(canvas);
+    furi_check(canvas);
     x += canvas->offset_x;
     y += canvas->offset_y;
     canvas_draw_u8g2_bitmap(&canvas->fb, x, y, w, h, bitmap, IconRotation0);
 }
 
 void canvas_draw_glyph(Canvas* canvas, uint8_t x, uint8_t y, uint16_t ch) {
-    furi_assert(canvas);
+    furi_check(canvas);
     x += canvas->offset_x;
     y += canvas->offset_y;
     u8g2_DrawGlyph(&canvas->fb, x, y, ch);
@@ -558,7 +554,7 @@ void canvas_set_bitmap_mode(Canvas* canvas, bool alpha) {
 }
 
 void canvas_set_orientation(Canvas* canvas, CanvasOrientation orientation) {
-    furi_assert(canvas);
+    furi_check(canvas);
     const u8g2_cb_t* rotate_cb = NULL;
     bool need_swap = false;
     if(canvas->orientation != orientation) {
@@ -598,12 +594,12 @@ CanvasOrientation canvas_get_orientation(const Canvas* canvas) {
 }
 
 void canvas_add_framebuffer_callback(Canvas* canvas, CanvasCommitCallback callback, void* context) {
-    furi_assert(canvas);
+    furi_check(canvas);
 
     const CanvasCallbackPair p = {callback, context};
 
     canvas_lock(canvas);
-    furi_assert(!CanvasCallbackPairArray_count(canvas->canvas_callback_pair, p));
+    furi_check(!CanvasCallbackPairArray_count(canvas->canvas_callback_pair, p));
     CanvasCallbackPairArray_push_back(canvas->canvas_callback_pair, p);
     canvas_unlock(canvas);
 }
@@ -612,12 +608,12 @@ void canvas_remove_framebuffer_callback(
     Canvas* canvas,
     CanvasCommitCallback callback,
     void* context) {
-    furi_assert(canvas);
+    furi_check(canvas);
 
     const CanvasCallbackPair p = {callback, context};
 
     canvas_lock(canvas);
-    furi_assert(CanvasCallbackPairArray_count(canvas->canvas_callback_pair, p) == 1);
+    furi_check(CanvasCallbackPairArray_count(canvas->canvas_callback_pair, p) == 1);
     CanvasCallbackPairArray_remove_val(canvas->canvas_callback_pair, p);
     canvas_unlock(canvas);
 }