From 9fc0c3cf98db0a5327f406c4ebb3990b2cfa60da Mon Sep 17 00:00:00 2001 From: Xiang Xiao Date: Thu, 9 Sep 2021 21:34:36 +0800 Subject: [PATCH] fix(lv_log.h): remove the duplicated semicolon from LV_LOG_xxx (#2544) and fix the caller who forget to add semicolon at the line end Signed-off-by: Xiang Xiao --- src/core/lv_obj.c | 12 ++++++------ src/core/lv_obj_pos.c | 6 +++--- src/core/lv_obj_tree.c | 12 ++++++------ src/core/lv_refr.c | 2 +- src/draw/lv_draw_rect.c | 2 +- src/draw/lv_img_decoder.c | 2 +- src/extra/widgets/animimg/lv_animimg.c | 2 +- src/extra/widgets/calendar/lv_calendar.c | 2 +- src/extra/widgets/chart/lv_chart.c | 4 ++-- src/extra/widgets/colorwheel/lv_colorwheel.c | 2 +- src/extra/widgets/imgbtn/lv_imgbtn.c | 2 +- src/extra/widgets/keyboard/lv_keyboard.c | 2 +- src/extra/widgets/led/lv_led.c | 2 +- src/extra/widgets/list/lv_list.c | 6 +++--- src/extra/widgets/meter/lv_meter.c | 2 +- src/extra/widgets/msgbox/lv_msgbox.c | 2 +- src/extra/widgets/spinbox/lv_spinbox.c | 2 +- src/extra/widgets/tabview/lv_tabview.c | 2 +- src/extra/widgets/tileview/lv_tileview.c | 4 ++-- src/extra/widgets/win/lv_win.c | 2 +- src/font/lv_font_fmt_txt.c | 2 +- src/hal/lv_hal_disp.c | 4 ++-- src/misc/lv_log.h | 20 ++++++++++---------- src/misc/lv_mem.c | 4 ++-- src/misc/lv_style.c | 2 +- src/widgets/lv_arc.c | 2 +- src/widgets/lv_bar.c | 2 +- src/widgets/lv_btn.c | 2 +- src/widgets/lv_btnmatrix.c | 2 +- src/widgets/lv_canvas.c | 2 +- src/widgets/lv_checkbox.c | 2 +- src/widgets/lv_dropdown.c | 6 +++--- src/widgets/lv_img.c | 2 +- src/widgets/lv_label.c | 2 +- src/widgets/lv_line.c | 2 +- src/widgets/lv_roller.c | 6 +++--- src/widgets/lv_slider.c | 2 +- src/widgets/lv_switch.c | 2 +- src/widgets/lv_table.c | 2 +- src/widgets/lv_textarea.c | 2 +- 40 files changed, 71 insertions(+), 71 deletions(-) diff --git a/src/core/lv_obj.c b/src/core/lv_obj.c index ab48be0f9..180cfc358 100644 --- a/src/core/lv_obj.c +++ b/src/core/lv_obj.c @@ -138,7 +138,7 @@ void lv_init(void) uint8_t * txt_u8 = (uint8_t *)txt; if(txt_u8[0] != 0xc3 || txt_u8[1] != 0x81 || txt_u8[2] != 0x00) { - LV_LOG_WARN("The strings has no UTF-8 encoding. Non-ASCII characters won't be displayed.") + LV_LOG_WARN("The strings has no UTF-8 encoding. Non-ASCII characters won't be displayed."); } uint32_t endianess_test = 0x11223344; @@ -152,19 +152,19 @@ void lv_init(void) } #if LV_USE_ASSERT_MEM_INTEGRITY - LV_LOG_WARN("Memory integrity checks are enabled via LV_USE_ASSERT_MEM_INTEGRITY which makes LVGL much slower") + LV_LOG_WARN("Memory integrity checks are enabled via LV_USE_ASSERT_MEM_INTEGRITY which makes LVGL much slower"); #endif #if LV_USE_ASSERT_OBJ - LV_LOG_WARN("Object sanity checks are enabled via LV_USE_ASSERT_OBJ which makes LVGL much slower") + LV_LOG_WARN("Object sanity checks are enabled via LV_USE_ASSERT_OBJ which makes LVGL much slower"); #endif #if LV_USE_ASSERT_STYLE - LV_LOG_WARN("Style sanity checks are enabled that uses more RAM") + LV_LOG_WARN("Style sanity checks are enabled that uses more RAM"); #endif #if LV_LOG_LEVEL == LV_LOG_LEVEL_TRACE - LV_LOG_WARN("Log level is set the Trace which makes LVGL much slower") + LV_LOG_WARN("Log level is set the Trace which makes LVGL much slower"); #endif lv_extra_init(); @@ -194,7 +194,7 @@ void lv_deinit(void) lv_obj_t * lv_obj_create(lv_obj_t * parent) { - LV_LOG_INFO("begin") + LV_LOG_INFO("begin"); lv_obj_t * obj = lv_obj_class_create_obj(MY_CLASS, parent); lv_obj_class_init_obj(obj); return obj; diff --git a/src/core/lv_obj_pos.c b/src/core/lv_obj_pos.c index c87bc81de..0c78ada21 100644 --- a/src/core/lv_obj_pos.c +++ b/src/core/lv_obj_pos.c @@ -290,7 +290,7 @@ void lv_obj_update_layout(const lv_obj_t * obj) { static bool mutex = false; if(mutex) { - LV_LOG_TRACE("Already running, returning") + LV_LOG_TRACE("Already running, returning"); return; } mutex = true; @@ -299,10 +299,10 @@ void lv_obj_update_layout(const lv_obj_t * obj) /*Repeat until there where layout invalidations*/ while(scr->scr_layout_inv) { - LV_LOG_INFO("Layout update begin") + LV_LOG_INFO("Layout update begin"); scr->scr_layout_inv = 0; layout_update_core(scr); - LV_LOG_TRACE("Layout update end") + LV_LOG_TRACE("Layout update end"); } mutex = false; diff --git a/src/core/lv_obj_tree.c b/src/core/lv_obj_tree.c index 2db083580..9baea74d6 100644 --- a/src/core/lv_obj_tree.c +++ b/src/core/lv_obj_tree.c @@ -48,7 +48,7 @@ static lv_obj_tree_walk_res_t walk_core(lv_obj_t * obj, lv_obj_tree_walk_cb_t cb void lv_obj_del(lv_obj_t * obj) { - LV_LOG_TRACE("begin (delete %p)", obj) + LV_LOG_TRACE("begin (delete %p)", obj); LV_ASSERT_OBJ(obj, MY_CLASS); lv_obj_invalidate(obj); @@ -76,17 +76,17 @@ void lv_obj_del(lv_obj_t * obj) /*Handle if the active screen was deleted*/ if(act_scr_del) { - LV_LOG_WARN("the active screen was deleted") + LV_LOG_WARN("the active screen was deleted"); disp->act_scr = NULL; } LV_ASSERT_MEM_INTEGRITY(); - LV_LOG_TRACE("finished (delete %p)", obj) + LV_LOG_TRACE("finished (delete %p)", obj); } void lv_obj_clean(lv_obj_t * obj) { - LV_LOG_TRACE("begin (delete %p)", obj) + LV_LOG_TRACE("begin (delete %p)", obj); LV_ASSERT_OBJ(obj, MY_CLASS); lv_obj_invalidate(obj); @@ -105,7 +105,7 @@ void lv_obj_clean(lv_obj_t * obj) LV_ASSERT_MEM_INTEGRITY(); - LV_LOG_TRACE("finished (delete %p)", obj) + LV_LOG_TRACE("finished (delete %p)", obj); } void lv_obj_del_delayed(lv_obj_t * obj, uint32_t delay_ms) @@ -286,7 +286,7 @@ lv_disp_t * lv_obj_get_disp(const lv_obj_t * obj) } } - LV_LOG_WARN("No screen found") + LV_LOG_WARN("No screen found"); return NULL; } diff --git a/src/core/lv_refr.c b/src/core/lv_refr.c index a6e973c6c..66a712905 100644 --- a/src/core/lv_refr.c +++ b/src/core/lv_refr.c @@ -529,7 +529,7 @@ static void lv_refr_area_part(const lv_area_t * area_p) lv_draw_img(&a, &start_mask, disp_refr->bg_img, &dsc); } else { - LV_LOG_WARN("Can't draw the background image") + LV_LOG_WARN("Can't draw the background image"); } } else { diff --git a/src/draw/lv_draw_rect.c b/src/draw/lv_draw_rect.c index 3b39e8d69..9af8b5bae 100644 --- a/src/draw/lv_draw_rect.c +++ b/src/draw/lv_draw_rect.c @@ -147,7 +147,7 @@ LV_ATTRIBUTE_FAST_MEM static void draw_bg(const lv_area_t * coords, const lv_are /*Complex case: there is gradient, mask, or radius*/ #if LV_DRAW_COMPLEX == 0 - LV_LOG_WARN("Can't draw complex rectangle because LV_DRAW_COMPLEX = 0") + LV_LOG_WARN("Can't draw complex rectangle because LV_DRAW_COMPLEX = 0"); #else /*Get clipped fill area which is the real draw area. *It is always the same or inside `fill_area`*/ diff --git a/src/draw/lv_img_decoder.c b/src/draw/lv_img_decoder.c index 842115558..886a65958 100644 --- a/src/draw/lv_img_decoder.c +++ b/src/draw/lv_img_decoder.c @@ -435,7 +435,7 @@ lv_res_t lv_img_decoder_built_in_open(lv_img_decoder_t * decoder, lv_img_decoder /*Free the potentially allocated memories*/ lv_img_decoder_built_in_close(decoder, dsc); - LV_LOG_WARN("Image decoder open: unknown color format") + LV_LOG_WARN("Image decoder open: unknown color format"); return LV_RES_INV; } } diff --git a/src/extra/widgets/animimg/lv_animimg.c b/src/extra/widgets/animimg/lv_animimg.c index 7d7cdfe65..83f7f1a06 100644 --- a/src/extra/widgets/animimg/lv_animimg.c +++ b/src/extra/widgets/animimg/lv_animimg.c @@ -56,7 +56,7 @@ const lv_obj_class_t lv_animimg_class = { lv_obj_t * lv_animimg_create(lv_obj_t * parent) { - LV_LOG_INFO("begin") + LV_LOG_INFO("begin"); lv_obj_t * obj = lv_obj_class_create_obj(&lv_animimg_class, parent); lv_obj_class_init_obj(obj); return obj; diff --git a/src/extra/widgets/calendar/lv_calendar.c b/src/extra/widgets/calendar/lv_calendar.c index 688b8ff5a..edb0aa3a1 100644 --- a/src/extra/widgets/calendar/lv_calendar.c +++ b/src/extra/widgets/calendar/lv_calendar.c @@ -56,7 +56,7 @@ static const char * day_names_def[7] = LV_CALENDAR_DEFAULT_DAY_NAMES; lv_obj_t * lv_calendar_create(lv_obj_t * parent) { - LV_LOG_INFO("begin") + LV_LOG_INFO("begin"); lv_obj_t * obj = lv_obj_class_create_obj(&lv_calendar_class, parent); lv_obj_class_init_obj(obj); return obj; diff --git a/src/extra/widgets/chart/lv_chart.c b/src/extra/widgets/chart/lv_chart.c index 0f142358f..ce658ce1a 100644 --- a/src/extra/widgets/chart/lv_chart.c +++ b/src/extra/widgets/chart/lv_chart.c @@ -63,7 +63,7 @@ const lv_obj_class_t lv_chart_class = { lv_obj_t * lv_chart_create(lv_obj_t * parent) { - LV_LOG_INFO("begin") + LV_LOG_INFO("begin"); lv_obj_t * obj = lv_obj_class_create_obj(MY_CLASS, parent); lv_obj_class_init_obj(obj); return obj; @@ -328,7 +328,7 @@ void lv_chart_refresh(lv_obj_t * obj) lv_chart_series_t * lv_chart_add_series(lv_obj_t * obj, lv_color_t color, lv_chart_axis_t axis) { - LV_LOG_INFO("begin") + LV_LOG_INFO("begin"); LV_ASSERT_OBJ(obj, MY_CLASS); diff --git a/src/extra/widgets/colorwheel/lv_colorwheel.c b/src/extra/widgets/colorwheel/lv_colorwheel.c index ebae114b1..c3d7d1c72 100644 --- a/src/extra/widgets/colorwheel/lv_colorwheel.c +++ b/src/extra/widgets/colorwheel/lv_colorwheel.c @@ -74,7 +74,7 @@ static bool create_knob_recolor; */ lv_obj_t * lv_colorwheel_create(lv_obj_t * parent, bool knob_recolor) { - LV_LOG_INFO("begin") + LV_LOG_INFO("begin"); create_knob_recolor = knob_recolor; lv_obj_t * obj = lv_obj_class_create_obj(MY_CLASS, parent); diff --git a/src/extra/widgets/imgbtn/lv_imgbtn.c b/src/extra/widgets/imgbtn/lv_imgbtn.c index 2dc959c5c..0d167ebaa 100644 --- a/src/extra/widgets/imgbtn/lv_imgbtn.c +++ b/src/extra/widgets/imgbtn/lv_imgbtn.c @@ -55,7 +55,7 @@ const lv_obj_class_t lv_imgbtn_class = { */ lv_obj_t * lv_imgbtn_create(lv_obj_t * parent) { - LV_LOG_INFO("begin") + LV_LOG_INFO("begin"); lv_obj_t * obj = lv_obj_class_create_obj(MY_CLASS, parent); lv_obj_class_init_obj(obj); return obj; diff --git a/src/extra/widgets/keyboard/lv_keyboard.c b/src/extra/widgets/keyboard/lv_keyboard.c index 166b66af0..8359e2a88 100644 --- a/src/extra/widgets/keyboard/lv_keyboard.c +++ b/src/extra/widgets/keyboard/lv_keyboard.c @@ -121,7 +121,7 @@ static const lv_btnmatrix_ctrl_t * kb_ctrl[5] = { */ lv_obj_t * lv_keyboard_create(lv_obj_t * parent) { - LV_LOG_INFO("begin") + LV_LOG_INFO("begin"); lv_obj_t * obj = lv_obj_class_create_obj(&lv_keyboard_class, parent); lv_obj_class_init_obj(obj); return obj; diff --git a/src/extra/widgets/led/lv_led.c b/src/extra/widgets/led/lv_led.c index 4f415c038..62b2d7c60 100644 --- a/src/extra/widgets/led/lv_led.c +++ b/src/extra/widgets/led/lv_led.c @@ -51,7 +51,7 @@ const lv_obj_class_t lv_led_class = { */ lv_obj_t * lv_led_create(lv_obj_t * parent) { - LV_LOG_INFO("begin") + LV_LOG_INFO("begin"); lv_obj_t * obj = lv_obj_class_create_obj(MY_CLASS, parent); lv_obj_class_init_obj(obj); return obj; diff --git a/src/extra/widgets/list/lv_list.c b/src/extra/widgets/list/lv_list.c index 07d62689d..798fb708a 100644 --- a/src/extra/widgets/list/lv_list.c +++ b/src/extra/widgets/list/lv_list.c @@ -55,7 +55,7 @@ const lv_obj_class_t lv_list_text_class = { lv_obj_t * lv_list_create(lv_obj_t * parent) { - LV_LOG_INFO("begin") + LV_LOG_INFO("begin"); lv_obj_t * obj = lv_obj_class_create_obj(&lv_list_class, parent); lv_obj_class_init_obj(obj); lv_obj_set_flex_flow(obj, LV_FLEX_FLOW_COLUMN); @@ -64,7 +64,7 @@ lv_obj_t * lv_list_create(lv_obj_t * parent) lv_obj_t * lv_list_add_text(lv_obj_t * list, const char * txt) { - LV_LOG_INFO("begin") + LV_LOG_INFO("begin"); lv_obj_t * obj = lv_obj_class_create_obj(&lv_list_text_class, list); lv_obj_class_init_obj(obj); lv_label_set_text(obj, txt); @@ -75,7 +75,7 @@ lv_obj_t * lv_list_add_text(lv_obj_t * list, const char * txt) lv_obj_t * lv_list_add_btn(lv_obj_t * list, const char * icon, const char * txt) { - LV_LOG_INFO("begin") + LV_LOG_INFO("begin"); lv_obj_t * obj = lv_obj_class_create_obj(&lv_list_btn_class, list); lv_obj_class_init_obj(obj); lv_obj_set_size(obj, LV_PCT(100), LV_SIZE_CONTENT); diff --git a/src/extra/widgets/meter/lv_meter.c b/src/extra/widgets/meter/lv_meter.c index f114e0ef9..d19de90aa 100644 --- a/src/extra/widgets/meter/lv_meter.c +++ b/src/extra/widgets/meter/lv_meter.c @@ -51,7 +51,7 @@ const lv_obj_class_t lv_meter_class = { lv_obj_t * lv_meter_create(lv_obj_t * parent) { - LV_LOG_INFO("begin") + LV_LOG_INFO("begin"); lv_obj_t * obj = lv_obj_class_create_obj(MY_CLASS, parent); lv_obj_class_init_obj(obj); return obj; diff --git a/src/extra/widgets/msgbox/lv_msgbox.c b/src/extra/widgets/msgbox/lv_msgbox.c index d88cfc52d..c15d7d875 100644 --- a/src/extra/widgets/msgbox/lv_msgbox.c +++ b/src/extra/widgets/msgbox/lv_msgbox.c @@ -39,7 +39,7 @@ const lv_obj_class_t lv_msgbox_class = {.base_class = &lv_obj_class, .instance_s lv_obj_t * lv_msgbox_create(lv_obj_t * parent, const char * title, const char * txt, const char * btn_txts[], bool add_close_btn) { - LV_LOG_INFO("begin") + LV_LOG_INFO("begin"); bool auto_parent = false; if(parent == NULL) { auto_parent = true; diff --git a/src/extra/widgets/spinbox/lv_spinbox.c b/src/extra/widgets/spinbox/lv_spinbox.c index 0c96465ac..1327a18a2 100644 --- a/src/extra/widgets/spinbox/lv_spinbox.c +++ b/src/extra/widgets/spinbox/lv_spinbox.c @@ -46,7 +46,7 @@ const lv_obj_class_t lv_spinbox_class = { lv_obj_t * lv_spinbox_create(lv_obj_t * parent) { - LV_LOG_INFO("begin") + LV_LOG_INFO("begin"); lv_obj_t * obj = lv_obj_class_create_obj(MY_CLASS, parent); lv_obj_class_init_obj(obj); return obj; diff --git a/src/extra/widgets/tabview/lv_tabview.c b/src/extra/widgets/tabview/lv_tabview.c index 1fff72625..2fbf6d2f4 100644 --- a/src/extra/widgets/tabview/lv_tabview.c +++ b/src/extra/widgets/tabview/lv_tabview.c @@ -51,7 +51,7 @@ static lv_coord_t tabsize_create; lv_obj_t * lv_tabview_create(lv_obj_t * parent, lv_dir_t tab_pos, lv_coord_t tab_size) { - LV_LOG_INFO("begin") + LV_LOG_INFO("begin"); tabpos_create = tab_pos; tabsize_create = tab_size; diff --git a/src/extra/widgets/tileview/lv_tileview.c b/src/extra/widgets/tileview/lv_tileview.c index 1bbe110ac..63a6c09a9 100644 --- a/src/extra/widgets/tileview/lv_tileview.c +++ b/src/extra/widgets/tileview/lv_tileview.c @@ -50,7 +50,7 @@ static uint32_t create_row_id; lv_obj_t * lv_tileview_create(lv_obj_t * parent) { - LV_LOG_INFO("begin") + LV_LOG_INFO("begin"); lv_obj_t * obj = lv_obj_class_create_obj(&lv_tileview_class, parent); lv_obj_class_init_obj(obj); return obj; @@ -62,7 +62,7 @@ lv_obj_t * lv_tileview_create(lv_obj_t * parent) lv_obj_t * lv_tileview_add_tile(lv_obj_t * tv, uint8_t col_id, uint8_t row_id, lv_dir_t dir) { - LV_LOG_INFO("begin") + LV_LOG_INFO("begin"); create_dir = dir; create_col_id = col_id; create_row_id = row_id; diff --git a/src/extra/widgets/win/lv_win.c b/src/extra/widgets/win/lv_win.c index eb9eb8eb6..fe4fb57f2 100644 --- a/src/extra/widgets/win/lv_win.c +++ b/src/extra/widgets/win/lv_win.c @@ -44,7 +44,7 @@ static lv_coord_t create_header_height; lv_obj_t * lv_win_create(lv_obj_t * parent, lv_coord_t header_height) { - LV_LOG_INFO("begin") + LV_LOG_INFO("begin"); create_header_height = header_height; lv_obj_t * obj = lv_obj_class_create_obj(&lv_win_class, parent); diff --git a/src/font/lv_font_fmt_txt.c b/src/font/lv_font_fmt_txt.c index d83235b22..73bed69b7 100644 --- a/src/font/lv_font_fmt_txt.c +++ b/src/font/lv_font_fmt_txt.c @@ -128,7 +128,7 @@ const uint8_t * lv_font_get_bitmap_fmt_txt(const lv_font_t * font, uint32_t unic (uint8_t)fdsc->bpp, prefilter); return LV_GC_ROOT(_lv_font_decompr_buf); #else /*!LV_USE_FONT_COMPRESSED*/ -// LV_LOG_WARN("Compressed fonts is used but LV_USE_FONT_COMPRESSED is not enabled in lv_conf.h") +// LV_LOG_WARN("Compressed fonts is used but LV_USE_FONT_COMPRESSED is not enabled in lv_conf.h"); return NULL; #endif } diff --git a/src/hal/lv_hal_disp.c b/src/hal/lv_hal_disp.c index d0d489fa7..400dda73f 100644 --- a/src/hal/lv_hal_disp.c +++ b/src/hal/lv_hal_disp.c @@ -139,7 +139,7 @@ lv_disp_t * lv_disp_drv_register(lv_disp_drv_t * driver) if(driver->full_refresh && driver->draw_buf->size < (uint32_t)driver->hor_res * driver->ver_res) { driver->full_refresh = 0; - LV_LOG_WARN("full_refresh requires at least screen sized draw buffer(s)") + LV_LOG_WARN("full_refresh requires at least screen sized draw buffer(s)"); } disp->bg_color = lv_color_white(); @@ -187,7 +187,7 @@ void lv_disp_drv_update(lv_disp_t * disp, lv_disp_drv_t * new_drv) if(disp->driver->full_refresh && disp->driver->draw_buf->size < (uint32_t)disp->driver->hor_res * disp->driver->ver_res) { disp->driver->full_refresh = 0; - LV_LOG_WARN("full_refresh requires at least screen sized draw buffer(s)") + LV_LOG_WARN("full_refresh requires at least screen sized draw buffer(s)"); } lv_coord_t w = lv_disp_get_hor_res(disp); diff --git a/src/misc/lv_log.h b/src/misc/lv_log.h index e9959cbfb..05ecce3ac 100644 --- a/src/misc/lv_log.h +++ b/src/misc/lv_log.h @@ -84,33 +84,33 @@ void _lv_log_add(lv_log_level_t level, const char * file, int line, const char * **********************/ #if LV_LOG_LEVEL <= LV_LOG_LEVEL_TRACE -#define LV_LOG_TRACE(...) _lv_log_add(LV_LOG_LEVEL_TRACE, __FILE__, __LINE__, __func__, __VA_ARGS__); +#define LV_LOG_TRACE(...) _lv_log_add(LV_LOG_LEVEL_TRACE, __FILE__, __LINE__, __func__, __VA_ARGS__) #else -#define LV_LOG_TRACE(...) do {}while(0); +#define LV_LOG_TRACE(...) do {}while(0) #endif #if LV_LOG_LEVEL <= LV_LOG_LEVEL_INFO -#define LV_LOG_INFO(...) _lv_log_add(LV_LOG_LEVEL_INFO, __FILE__, __LINE__, __func__, __VA_ARGS__); +#define LV_LOG_INFO(...) _lv_log_add(LV_LOG_LEVEL_INFO, __FILE__, __LINE__, __func__, __VA_ARGS__) #else -#define LV_LOG_INFO(...) do {}while(0); +#define LV_LOG_INFO(...) do {}while(0) #endif #if LV_LOG_LEVEL <= LV_LOG_LEVEL_WARN -#define LV_LOG_WARN(...) _lv_log_add(LV_LOG_LEVEL_WARN, __FILE__, __LINE__, __func__, __VA_ARGS__); +#define LV_LOG_WARN(...) _lv_log_add(LV_LOG_LEVEL_WARN, __FILE__, __LINE__, __func__, __VA_ARGS__) #else -#define LV_LOG_WARN(...) do {}while(0); +#define LV_LOG_WARN(...) do {}while(0) #endif #if LV_LOG_LEVEL <= LV_LOG_LEVEL_ERROR -#define LV_LOG_ERROR(...) _lv_log_add(LV_LOG_LEVEL_ERROR, __FILE__, __LINE__, __func__, __VA_ARGS__); +#define LV_LOG_ERROR(...) _lv_log_add(LV_LOG_LEVEL_ERROR, __FILE__, __LINE__, __func__, __VA_ARGS__) #else -#define LV_LOG_ERROR(...) do {}while(0); +#define LV_LOG_ERROR(...) do {}while(0) #endif #if LV_LOG_LEVEL <= LV_LOG_LEVEL_USER -#define LV_LOG_USER(...) _lv_log_add(LV_LOG_LEVEL_USER, __FILE__, __LINE__, __func__, __VA_ARGS__); +#define LV_LOG_USER(...) _lv_log_add(LV_LOG_LEVEL_USER, __FILE__, __LINE__, __func__, __VA_ARGS__) #else -#define LV_LOG_USER(...) do {}while(0); +#define LV_LOG_USER(...) do {}while(0) #endif #else /*LV_USE_LOG*/ diff --git a/src/misc/lv_mem.c b/src/misc/lv_mem.c index 17c280703..7d4477b3b 100644 --- a/src/misc/lv_mem.c +++ b/src/misc/lv_mem.c @@ -99,7 +99,7 @@ void lv_mem_init(void) #endif #if LV_MEM_ADD_JUNK - LV_LOG_WARN("LV_MEM_ADD_JUNK is enabled which makes LVGL much slower") + LV_LOG_WARN("LV_MEM_ADD_JUNK is enabled which makes LVGL much slower"); #endif } @@ -324,7 +324,7 @@ void lv_mem_buf_release(void * p) } } - LV_LOG_ERROR("p is not a known buffer") + LV_LOG_ERROR("p is not a known buffer"); } /** diff --git a/src/misc/lv_style.c b/src/misc/lv_style.c index 058c54504..2755b285f 100644 --- a/src/misc/lv_style.c +++ b/src/misc/lv_style.c @@ -41,7 +41,7 @@ void lv_style_init(lv_style_t * style) { #if LV_USE_ASSERT_STYLE if(style->sentinel == LV_STYLE_SENTINEL_VALUE && style->prop_cnt > 1) { - LV_LOG_WARN("Style might be already inited. (Potential memory leak)") + LV_LOG_WARN("Style might be already inited. (Potential memory leak)"); } #endif diff --git a/src/widgets/lv_arc.c b/src/widgets/lv_arc.c index 1802fc15f..4c971dc25 100644 --- a/src/widgets/lv_arc.c +++ b/src/widgets/lv_arc.c @@ -64,7 +64,7 @@ const lv_obj_class_t lv_arc_class = { */ lv_obj_t * lv_arc_create(lv_obj_t * parent) { - LV_LOG_INFO("begin") + LV_LOG_INFO("begin"); lv_obj_t * obj = lv_obj_class_create_obj(MY_CLASS, parent); lv_obj_class_init_obj(obj); return obj; diff --git a/src/widgets/lv_bar.c b/src/widgets/lv_bar.c index c15bd8422..4558d8565 100644 --- a/src/widgets/lv_bar.c +++ b/src/widgets/lv_bar.c @@ -77,7 +77,7 @@ const lv_obj_class_t lv_bar_class = { lv_obj_t * lv_bar_create(lv_obj_t * parent) { - LV_LOG_INFO("begin") + LV_LOG_INFO("begin"); lv_obj_t * obj = lv_obj_class_create_obj(MY_CLASS, parent); lv_obj_class_init_obj(obj); return obj; diff --git a/src/widgets/lv_btn.c b/src/widgets/lv_btn.c index 3605ccc7d..5676dc7a4 100644 --- a/src/widgets/lv_btn.c +++ b/src/widgets/lv_btn.c @@ -48,7 +48,7 @@ const lv_obj_class_t lv_btn_class = { lv_obj_t * lv_btn_create(lv_obj_t * parent) { - LV_LOG_INFO("begin") + LV_LOG_INFO("begin"); lv_obj_t * obj = lv_obj_class_create_obj(MY_CLASS, parent); lv_obj_class_init_obj(obj); return obj; diff --git a/src/widgets/lv_btnmatrix.c b/src/widgets/lv_btnmatrix.c index baa79b841..fdd09d4c9 100644 --- a/src/widgets/lv_btnmatrix.c +++ b/src/widgets/lv_btnmatrix.c @@ -79,7 +79,7 @@ const lv_obj_class_t lv_btnmatrix_class = { lv_obj_t * lv_btnmatrix_create(lv_obj_t * parent) { - LV_LOG_INFO("begin") + LV_LOG_INFO("begin"); lv_obj_t * obj = lv_obj_class_create_obj(MY_CLASS, parent); lv_obj_class_init_obj(obj); return obj; diff --git a/src/widgets/lv_canvas.c b/src/widgets/lv_canvas.c index 7c796f6ad..a6986b23b 100644 --- a/src/widgets/lv_canvas.c +++ b/src/widgets/lv_canvas.c @@ -49,7 +49,7 @@ const lv_obj_class_t lv_canvas_class = { lv_obj_t * lv_canvas_create(lv_obj_t * parent) { - LV_LOG_INFO("begin") + LV_LOG_INFO("begin"); lv_obj_t * obj = lv_obj_class_create_obj(MY_CLASS, parent); lv_obj_class_init_obj(obj); return obj; diff --git a/src/widgets/lv_checkbox.c b/src/widgets/lv_checkbox.c index a4dfe1849..33a5bb06f 100644 --- a/src/widgets/lv_checkbox.c +++ b/src/widgets/lv_checkbox.c @@ -55,7 +55,7 @@ const lv_obj_class_t lv_checkbox_class = { lv_obj_t * lv_checkbox_create(lv_obj_t * parent) { - LV_LOG_INFO("begin") + LV_LOG_INFO("begin"); lv_obj_t * obj = lv_obj_class_create_obj(MY_CLASS, parent); lv_obj_class_init_obj(obj); return obj; diff --git a/src/widgets/lv_dropdown.c b/src/widgets/lv_dropdown.c index 1fb734145..7d0676c0e 100644 --- a/src/widgets/lv_dropdown.c +++ b/src/widgets/lv_dropdown.c @@ -90,7 +90,7 @@ const lv_obj_class_t lv_dropdownlist_class = { lv_obj_t * lv_dropdown_create(lv_obj_t * parent) { - LV_LOG_INFO("begin") + LV_LOG_INFO("begin"); lv_obj_t * obj = lv_obj_class_create_obj(&lv_dropdown_class, parent); lv_obj_class_init_obj(obj); return obj; @@ -374,7 +374,7 @@ void lv_dropdown_get_selected_str(const lv_obj_t * obj, char * buf, uint32_t buf uint32_t c; for(c = 0; i < txt_len && dropdown->options[i] != '\n'; c++, i++) { if(buf_size && c >= buf_size - 1) { - LV_LOG_WARN("lv_dropdown_get_selected_str: the buffer was too small") + LV_LOG_WARN("lv_dropdown_get_selected_str: the buffer was too small"); break; } buf[c] = dropdown->options[i]; @@ -527,7 +527,7 @@ void lv_dropdown_close(lv_obj_t * obj) static lv_obj_t * lv_dropdown_list_create(lv_obj_t * parent) { - LV_LOG_INFO("begin") + LV_LOG_INFO("begin"); lv_obj_t * obj = lv_obj_class_create_obj(&lv_dropdownlist_class, parent); lv_obj_class_init_obj(obj); return obj; diff --git a/src/widgets/lv_img.c b/src/widgets/lv_img.c index b49695893..c38da60e6 100644 --- a/src/widgets/lv_img.c +++ b/src/widgets/lv_img.c @@ -56,7 +56,7 @@ const lv_obj_class_t lv_img_class = { lv_obj_t * lv_img_create(lv_obj_t * parent) { - LV_LOG_INFO("begin") + LV_LOG_INFO("begin"); lv_obj_t * obj = lv_obj_class_create_obj(MY_CLASS, parent); lv_obj_class_init_obj(obj); return obj; diff --git a/src/widgets/lv_label.c b/src/widgets/lv_label.c index d75bc9de6..b7c11cda8 100644 --- a/src/widgets/lv_label.c +++ b/src/widgets/lv_label.c @@ -72,7 +72,7 @@ const lv_obj_class_t lv_label_class = { lv_obj_t * lv_label_create(lv_obj_t * parent) { - LV_LOG_INFO("begin") + LV_LOG_INFO("begin"); lv_obj_t * obj = lv_obj_class_create_obj(MY_CLASS, parent); lv_obj_class_init_obj(obj); return obj; diff --git a/src/widgets/lv_line.c b/src/widgets/lv_line.c index 016882986..6fd297740 100644 --- a/src/widgets/lv_line.c +++ b/src/widgets/lv_line.c @@ -53,7 +53,7 @@ const lv_obj_class_t lv_line_class = { lv_obj_t * lv_line_create(lv_obj_t * parent) { - LV_LOG_INFO("begin") + LV_LOG_INFO("begin"); lv_obj_t * obj = lv_obj_class_create_obj(MY_CLASS, parent); lv_obj_class_init_obj(obj); return obj; diff --git a/src/widgets/lv_roller.c b/src/widgets/lv_roller.c index 40c4b4762..f8c0354dc 100644 --- a/src/widgets/lv_roller.c +++ b/src/widgets/lv_roller.c @@ -77,7 +77,7 @@ const lv_obj_class_t lv_roller_label_class = { */ lv_obj_t * lv_roller_create(lv_obj_t * parent) { - LV_LOG_INFO("begin") + LV_LOG_INFO("begin"); lv_obj_t * obj = lv_obj_class_create_obj(MY_CLASS, parent); lv_obj_class_init_obj(obj); return obj; @@ -242,7 +242,7 @@ void lv_roller_get_selected_str(const lv_obj_t * obj, char * buf, uint32_t buf_s uint32_t c; for(c = 0; i < txt_len && opt_txt[i] != '\n'; c++, i++) { if(buf_size && c >= buf_size - 1) { - LV_LOG_WARN("lv_dropdown_get_selected_str: the buffer was too small") + LV_LOG_WARN("lv_dropdown_get_selected_str: the buffer was too small"); break; } buf[c] = opt_txt[i]; @@ -301,7 +301,7 @@ static void lv_roller_constructor(const lv_obj_class_t * class_p, lv_obj_t * obj lv_obj_clear_flag(obj, LV_OBJ_FLAG_SCROLLABLE); lv_obj_clear_flag(obj, LV_OBJ_FLAG_SCROLL_CHAIN); - LV_LOG_INFO("begin") + LV_LOG_INFO("begin"); lv_obj_t * label = lv_obj_class_create_obj(&lv_roller_label_class, obj); lv_obj_class_init_obj(label); lv_roller_set_options(obj, "Option 1\nOption 2\nOption 3\nOption 4\nOption 5", LV_ROLLER_MODE_NORMAL); diff --git a/src/widgets/lv_slider.c b/src/widgets/lv_slider.c index ad8ef2466..24d48114a 100644 --- a/src/widgets/lv_slider.c +++ b/src/widgets/lv_slider.c @@ -58,7 +58,7 @@ const lv_obj_class_t lv_slider_class = { lv_obj_t * lv_slider_create(lv_obj_t * parent) { - LV_LOG_INFO("begin") + LV_LOG_INFO("begin"); lv_obj_t * obj = lv_obj_class_create_obj(MY_CLASS, parent); lv_obj_class_init_obj(obj); return obj; diff --git a/src/widgets/lv_switch.c b/src/widgets/lv_switch.c index 027fd98af..b90b86f6d 100644 --- a/src/widgets/lv_switch.c +++ b/src/widgets/lv_switch.c @@ -72,7 +72,7 @@ const lv_obj_class_t lv_switch_class = { lv_obj_t * lv_switch_create(lv_obj_t * parent) { - LV_LOG_INFO("begin") + LV_LOG_INFO("begin"); lv_obj_t * obj = lv_obj_class_create_obj(MY_CLASS, parent); lv_obj_class_init_obj(obj); return obj; diff --git a/src/widgets/lv_table.c b/src/widgets/lv_table.c index 79b101d12..ebde389f0 100644 --- a/src/widgets/lv_table.c +++ b/src/widgets/lv_table.c @@ -63,7 +63,7 @@ const lv_obj_class_t lv_table_class = { lv_obj_t * lv_table_create(lv_obj_t * parent) { - LV_LOG_INFO("begin") + LV_LOG_INFO("begin"); lv_obj_t * obj = lv_obj_class_create_obj(MY_CLASS, parent); lv_obj_class_init_obj(obj); return obj; diff --git a/src/widgets/lv_textarea.c b/src/widgets/lv_textarea.c index 5a0fec351..64a8610c8 100644 --- a/src/widgets/lv_textarea.c +++ b/src/widgets/lv_textarea.c @@ -83,7 +83,7 @@ static const char * ta_insert_replace; lv_obj_t * lv_textarea_create(lv_obj_t * parent) { - LV_LOG_INFO("begin") + LV_LOG_INFO("begin"); lv_obj_t * obj = lv_obj_class_create_obj(MY_CLASS, parent); lv_obj_class_init_obj(obj); return obj;