From e7b197ed76ec9fa176f443f91d85fb190fab7d67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=BA=A2=E6=A1=83=E5=85=AD?= Date: Sat, 23 Aug 2025 13:55:12 +0800 Subject: [PATCH] chore: remove multiple semicolons (#8723) Signed-off-by: liuhongchao --- examples/others/fragment/lv_example_fragment_1.c | 2 +- src/core/lv_obj_pos.c | 2 +- src/draw/nxp/g2d/lv_g2d_buf_map.c | 2 +- .../sw/blend/lv_draw_sw_blend_to_argb8888_premultiplied.c | 6 +++--- src/draw/sw/lv_draw_sw_mask.c | 6 +++--- src/libs/thorvg/tvgLottieBuilder.cpp | 4 ++-- src/libs/thorvg/tvgLottieModifier.cpp | 2 +- src/libs/thorvg/tvgRender.h | 2 +- src/libs/thorvg/tvgSvgLoader.cpp | 2 +- src/libs/thorvg/tvgSvgSceneBuilder.cpp | 2 +- src/libs/thorvg/tvgSwRenderer.cpp | 2 +- src/others/sysmon/lv_sysmon.c | 2 +- src/others/xml/parsers/lv_xml_table_parser.c | 4 ++-- src/widgets/span/lv_span.c | 4 ++-- src/widgets/table/lv_table.c | 2 +- 15 files changed, 22 insertions(+), 22 deletions(-) diff --git a/examples/others/fragment/lv_example_fragment_1.c b/examples/others/fragment/lv_example_fragment_1.c index 81ccf8e202..f0c449e838 100644 --- a/examples/others/fragment/lv_example_fragment_1.c +++ b/examples/others/fragment/lv_example_fragment_1.c @@ -45,7 +45,7 @@ static void sample_fragment_ctor(lv_fragment_t * self, void * args) static lv_obj_t * sample_fragment_create_obj(lv_fragment_t * self, lv_obj_t * parent) { lv_obj_t * label = lv_label_create(parent); - lv_obj_set_style_bg_opa(label, LV_OPA_COVER, 0);; + lv_obj_set_style_bg_opa(label, LV_OPA_COVER, 0); lv_label_set_text_fmt(label, "Hello, %s!", ((struct sample_fragment_t *) self)->name); return label; } diff --git a/src/core/lv_obj_pos.c b/src/core/lv_obj_pos.c index 6e3aa6e493..a88ace3979 100644 --- a/src/core/lv_obj_pos.c +++ b/src/core/lv_obj_pos.c @@ -1009,7 +1009,7 @@ void lv_obj_set_transform(lv_obj_t * obj, const lv_matrix_t * matrix) lv_obj_allocate_spec_attr(obj); if(!obj->spec_attr->matrix) { - obj->spec_attr->matrix = lv_malloc(sizeof(lv_matrix_t));; + obj->spec_attr->matrix = lv_malloc(sizeof(lv_matrix_t)); LV_ASSERT_MALLOC(obj->spec_attr->matrix); } diff --git a/src/draw/nxp/g2d/lv_g2d_buf_map.c b/src/draw/nxp/g2d/lv_g2d_buf_map.c index 00de516f6c..9f851ac155 100644 --- a/src/draw/nxp/g2d/lv_g2d_buf_map.c +++ b/src/draw/nxp/g2d/lv_g2d_buf_map.c @@ -203,7 +203,7 @@ static void _handle_collision(unsigned long index, lv_map_item_t * item) { if(table->overflow_list[index] == NULL) { /* Create the list. */ - lv_array_t * list = (lv_array_t *) lv_malloc(sizeof(lv_array_t));; + lv_array_t * list = (lv_array_t *) lv_malloc(sizeof(lv_array_t)); lv_array_init(list, LV_ARRAY_DEFAULT_CAPACITY, sizeof(lv_map_item_t)); lv_array_push_back(list, item); table->overflow_list[index] = list; diff --git a/src/draw/sw/blend/lv_draw_sw_blend_to_argb8888_premultiplied.c b/src/draw/sw/blend/lv_draw_sw_blend_to_argb8888_premultiplied.c index 71aacc1fea..a74863a0fe 100644 --- a/src/draw/sw/blend/lv_draw_sw_blend_to_argb8888_premultiplied.c +++ b/src/draw/sw/blend/lv_draw_sw_blend_to_argb8888_premultiplied.c @@ -533,9 +533,9 @@ static void LV_ATTRIBUTE_FAST_MEM rgb888_image_blend(lv_draw_sw_blend_image_dsc_ for(y = 0; y < h; y++) { for(dest_x = 0, src_x = 0; dest_x < w; dest_x++, src_x += src_px_size) { color_argb.alpha = (opa * mask_buf[dest_x]) >> 8; - color_argb.red = (src_buf[src_x + 2] * color_argb.alpha) >> 8;; - color_argb.green = (src_buf[src_x + 1] * color_argb.alpha) >> 8;; - color_argb.blue = (src_buf[src_x + 0] * color_argb.alpha) >> 8;; + color_argb.red = (src_buf[src_x + 2] * color_argb.alpha) >> 8; + color_argb.green = (src_buf[src_x + 1] * color_argb.alpha) >> 8; + color_argb.blue = (src_buf[src_x + 0] * color_argb.alpha) >> 8; dest_buf_c32[dest_x] = lv_color_32_32_mix_premul(color_argb, dest_buf_c32[dest_x], &cache); } dest_buf_c32 = drawbuf_next_row(dest_buf_c32, dest_stride); diff --git a/src/draw/sw/lv_draw_sw_mask.c b/src/draw/sw/lv_draw_sw_mask.c index 2426e1f3f7..8ad127245e 100644 --- a/src/draw/sw/lv_draw_sw_mask.c +++ b/src/draw/sw/lv_draw_sw_mask.c @@ -1137,7 +1137,7 @@ static void circ_calc_aa4(lv_draw_sw_mask_radius_circle_dsc_t * c, int32_t radiu cir_x[cir_size] = x_int[0] - 1; cir_y[cir_size] = y_8th_cnt; - c->cir_opa[cir_size] = 1 * 4 + x_fract[1] + x_fract[2] + x_fract[3];; + c->cir_opa[cir_size] = 1 * 4 + x_fract[1] + x_fract[2] + x_fract[3]; c->cir_opa[cir_size] *= 16; cir_size++; } @@ -1151,7 +1151,7 @@ static void circ_calc_aa4(lv_draw_sw_mask_radius_circle_dsc_t * c, int32_t radiu cir_x[cir_size] = x_int[0] - 1; cir_y[cir_size] = y_8th_cnt; - c->cir_opa[cir_size] = 2 * 4 + x_fract[2] + x_fract[3];; + c->cir_opa[cir_size] = 2 * 4 + x_fract[2] + x_fract[3]; c->cir_opa[cir_size] *= 16; cir_size++; } @@ -1165,7 +1165,7 @@ static void circ_calc_aa4(lv_draw_sw_mask_radius_circle_dsc_t * c, int32_t radiu cir_x[cir_size] = x_int[0] - 1; cir_y[cir_size] = y_8th_cnt; - c->cir_opa[cir_size] = 3 * 4 + x_fract[3];; + c->cir_opa[cir_size] = 3 * 4 + x_fract[3]; c->cir_opa[cir_size] *= 16; cir_size++; } diff --git a/src/libs/thorvg/tvgLottieBuilder.cpp b/src/libs/thorvg/tvgLottieBuilder.cpp index fc86e85072..3ed21f4fa0 100644 --- a/src/libs/thorvg/tvgLottieBuilder.cpp +++ b/src/libs/thorvg/tvgLottieBuilder.cpp @@ -48,8 +48,8 @@ static void _rotationXYZ(Matrix* m, float degreeX, float degreeY, float degreeZ) auto radianZ = deg2rad(degreeZ); auto cx = cosf(radianX), sx = sinf(radianX); - auto cy = cosf(radianY), sy = sinf(radianY);; - auto cz = cosf(radianZ), sz = sinf(radianZ);; + auto cy = cosf(radianY), sy = sinf(radianY); + auto cz = cosf(radianZ), sz = sinf(radianZ); m->e11 = cy * cz; m->e12 = -cy * sz; m->e21 = sx * sy * cz + cx * sz; diff --git a/src/libs/thorvg/tvgLottieModifier.cpp b/src/libs/thorvg/tvgLottieModifier.cpp index 5cf714a598..e4efae2ade 100644 --- a/src/libs/thorvg/tvgLottieModifier.cpp +++ b/src/libs/thorvg/tvgLottieModifier.cpp @@ -93,7 +93,7 @@ static bool _clockwise(const Point* pts, uint32_t n) for (uint32_t i = 0; i < n - 1; i++) { area += cross(pts[i], pts[i + 1]); } - area += cross(pts[n - 1], pts[0]);; + area += cross(pts[n - 1], pts[0]); return area < 0.0f; } diff --git a/src/libs/thorvg/tvgRender.h b/src/libs/thorvg/tvgRender.h index 3ec16ab4fd..dc18635923 100644 --- a/src/libs/thorvg/tvgRender.h +++ b/src/libs/thorvg/tvgRender.h @@ -263,7 +263,7 @@ struct RenderShape float strokeMiterlimit() const { if (!stroke) return 4.0f; - return stroke->miterlimit;; + return stroke->miterlimit; } }; diff --git a/src/libs/thorvg/tvgSvgLoader.cpp b/src/libs/thorvg/tvgSvgLoader.cpp index 6cab7084b8..0ab6870507 100644 --- a/src/libs/thorvg/tvgSvgLoader.cpp +++ b/src/libs/thorvg/tvgSvgLoader.cpp @@ -3756,7 +3756,7 @@ static bool _svgLoaderParserForValidCheckXmlOpen(SvgLoaderData* loader, const ch static bool _svgLoaderParserForValidCheck(void* data, SimpleXMLType type, const char* content, unsigned int length) { SvgLoaderData* loader = (SvgLoaderData*)data; - bool res = true;; + bool res = true; switch (type) { case SimpleXMLType::Open: diff --git a/src/libs/thorvg/tvgSvgSceneBuilder.cpp b/src/libs/thorvg/tvgSvgSceneBuilder.cpp index 4de08ee502..9fe2d07d21 100644 --- a/src/libs/thorvg/tvgSvgSceneBuilder.cpp +++ b/src/libs/thorvg/tvgSvgSceneBuilder.cpp @@ -733,7 +733,7 @@ static unique_ptr _useBuildHelper(SvgLoaderData& loaderData, const SvgNod auto width = (symbol.hasWidth ? symbol.w : vBox.w); if (node->node.use.isWidthSet) width = node->node.use.w; - auto height = (symbol.hasHeight ? symbol.h : vBox.h);; + auto height = (symbol.hasHeight ? symbol.h : vBox.h); if (node->node.use.isHeightSet) height = node->node.use.h; auto vw = (symbol.hasViewBox ? symbol.vw : width); auto vh = (symbol.hasViewBox ? symbol.vh : height); diff --git a/src/libs/thorvg/tvgSwRenderer.cpp b/src/libs/thorvg/tvgSwRenderer.cpp index 5b812d7f12..1733a1195f 100644 --- a/src/libs/thorvg/tvgSwRenderer.cpp +++ b/src/libs/thorvg/tvgSwRenderer.cpp @@ -88,7 +88,7 @@ struct SwShapeTask : SwTask Additionally, the stroke style should not be dashed. */ bool antialiasing(float strokeWidth) { - return strokeWidth < 2.0f || rshape->stroke->dashCnt > 0 || rshape->stroke->strokeFirst || rshape->strokeTrim() || rshape->stroke->color[3] < 255;; + return strokeWidth < 2.0f || rshape->stroke->dashCnt > 0 || rshape->stroke->strokeFirst || rshape->strokeTrim() || rshape->stroke->color[3] < 255; } float validStrokeWidth() diff --git a/src/others/sysmon/lv_sysmon.c b/src/others/sysmon/lv_sysmon.c index 52494f0d62..a225027937 100644 --- a/src/others/sysmon/lv_sysmon.c +++ b/src/others/sysmon/lv_sysmon.c @@ -384,7 +384,7 @@ static void mem_observer_cb(lv_observer_t * observer, lv_subject_t * subject) lv_obj_t * label = lv_observer_get_target(observer); const lv_mem_monitor_t * mon = lv_subject_get_pointer(subject); - size_t used_size = mon->total_size - mon->free_size;; + size_t used_size = mon->total_size - mon->free_size; size_t used_kb = used_size / 1024; size_t used_kb_tenth = (used_size - (used_kb * 1024)) / 102; size_t max_used_kb = mon->max_used / 1024; diff --git a/src/others/xml/parsers/lv_xml_table_parser.c b/src/others/xml/parsers/lv_xml_table_parser.c index d6a82514cb..c275c9d3d6 100644 --- a/src/others/xml/parsers/lv_xml_table_parser.c +++ b/src/others/xml/parsers/lv_xml_table_parser.c @@ -66,7 +66,7 @@ void * lv_xml_table_column_create(lv_xml_parser_state_t * state, const char ** a LV_UNUSED(attrs); /*Nothing to create*/ - return lv_xml_state_get_parent(state);; + return lv_xml_state_get_parent(state); } void lv_xml_table_column_apply(lv_xml_parser_state_t * state, const char ** attrs) @@ -90,7 +90,7 @@ void * lv_xml_table_cell_create(lv_xml_parser_state_t * state, const char ** att LV_UNUSED(attrs); /*Nothing to create*/ - return lv_xml_state_get_parent(state);; + return lv_xml_state_get_parent(state); } void lv_xml_table_cell_apply(lv_xml_parser_state_t * state, const char ** attrs) diff --git a/src/widgets/span/lv_span.c b/src/widgets/span/lv_span.c index acac2f9c88..7ac8bf98ff 100644 --- a/src/widgets/span/lv_span.c +++ b/src/widgets/span/lv_span.c @@ -950,7 +950,7 @@ static int32_t lv_span_get_style_text_decor(lv_obj_t * par, lv_span_t * span) lv_style_value_t value; lv_style_res_t res = lv_style_get_prop(&span->style, LV_STYLE_TEXT_DECOR, &value); if(res != LV_STYLE_RES_FOUND) { - decor = (lv_text_decor_t)lv_obj_get_style_text_decor(par, LV_PART_MAIN);; + decor = (lv_text_decor_t)lv_obj_get_style_text_decor(par, LV_PART_MAIN); } else { decor = (int32_t)value.num; @@ -1010,7 +1010,7 @@ static void lv_draw_span(lv_obj_t * obj, lv_layer_t * layer) /* init draw variable */ lv_text_flag_t txt_flag = LV_TEXT_FLAG_NONE; - int32_t line_space = lv_obj_get_style_text_line_space(obj, LV_PART_MAIN);; + int32_t line_space = lv_obj_get_style_text_line_space(obj, LV_PART_MAIN); int32_t max_width = lv_area_get_width(&coords); int32_t indent = convert_indent_pct(obj, max_width); int32_t max_w = max_width - indent; /* first line need minus indent */ diff --git a/src/widgets/table/lv_table.c b/src/widgets/table/lv_table.c index 8f8555d934..4a610cb22d 100644 --- a/src/widgets/table/lv_table.c +++ b/src/widgets/table/lv_table.c @@ -1042,7 +1042,7 @@ static lv_result_t get_pressed_cell(lv_obj_t * obj, uint32_t * row, uint32_t * c } if(row) { - int32_t y = p.y + lv_obj_get_scroll_y(obj);; + int32_t y = p.y + lv_obj_get_scroll_y(obj); y -= obj->coords.y1; y -= lv_obj_get_style_pad_top(obj, LV_PART_MAIN);