refactor: clear compiler warnings

lc-soft · Dec 10, 2023 · ac185c1 · ac185c1
1 parent a1f45b7
commit ac185c1
Show file tree

Hide file tree

Showing 11 changed files with 402 additions and 393 deletions.
diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml
@@ -25,7 +25,9 @@ jobs:
 
  - name: Install tools
  if: runner.os == 'Linux'
- run: sudo apt install debhelper lcov valgrind -yy
+ run: |
+ sudo apt-get update --fix-missing
+ sudo apt-get install debhelper lcov valgrind -yy
 
  - name: Configure for coverage mode
  if: runner.os == 'Linux'
@@ -95,10 +97,10 @@ jobs:
 
  - name: Package
  run: |
- xmake package
+ xmake package -v
  xmake install -o dist/lcui-package
 
- - name: Package exmaples
+ - name: Package examples
  run: |
  cd examples
  xmake -P . -v -y
@@ -122,7 +124,7 @@ jobs:
  uses: actions/cache@v3
  with:
  path: ~/.xmake/.cache/packages
- key: ${{ runner.os }}-xmake-pacages
+ key: ${{ runner.os }}-xmake-packages
 
  release:
  if: startsWith(github.ref, 'refs/tags/v')

diff --git a/examples/fabric/xmake.lua b/examples/fabric/xmake.lua
@@ -1,4 +1,4 @@
-add_requires("cairo 1.17.6")
+add_requires("cairo")
 
 target("fabric")
  set_kind("binary")

diff --git a/lib/css/src/library.c b/lib/css/src/library.c
@@ -254,7 +254,7 @@ static css_style_group_t *css_style_group_create(void)
 static css_style_decl_t *css_find_style_store(css_selector_t *selector,
  const char *space)
 {
- int i, right;
+ int i, right, len;
  css_style_link_t *link;
  css_style_rule_t *snode;
  css_style_link_group_t *slg;
@@ -296,8 +296,15 @@ static css_style_decl_t *css_find_style_store(css_selector_t *selector,
  strcpy(fullname, buf);
  } else {
  strcpy(fullname, buf);
- snprintf(buf, CSS_SELECTOR_MAX_LEN, "%s %s",
+ len = snprintf(buf, CSS_SELECTOR_MAX_LEN, "%s %s",
  sn->fullname, fullname);
+ if (len < 0) {
+ logger_error("[css-library] %s: "
+ "selector(%s...) too long\n",
+ space, fullname);
+ return NULL;
+ }
+ buf[len] = 0;
  }
  /* 如果有上一级的父链接记录，则将当前链接添加进去 */
  if (parents) {

diff --git a/lib/css/tests/test_css_computed.c b/lib/css/tests/test_css_computed.c
@@ -9,7 +9,7 @@ static void check_length(const char *str, css_numeric_value_t actual,
  ctest_equal_int(str, (int)actual, (int)expected);
 }
 
-static test_button_focus_style(void)
+static void test_button_focus_style(void)
 {
  css_selector_t *selector;
  css_style_decl_t *result;

diff --git a/lib/i18n/tests/test.c b/lib/i18n/tests/test.c
@@ -22,29 +22,29 @@ void test_i18n(void)
 
  i18n_change_language(L"en");
 
- ctest_equal_bool("i18n_translate(L\"name\") == L\"English\")",
+ ctest_equal_bool("en: i18n_translate(L\"name\") == L\"English\")",
  wcscmp(i18n_translate(L"name"), L"English") == 0,
  true);
 
- ctest_equal_bool("i18n_translate(L\"button.ok\") == L\"Ok\")",
+ ctest_equal_bool("en: i18n_translate(L\"button.ok\") == L\"Ok\")",
  wcscmp(i18n_translate(L"button.ok"), L"Ok") == 0,
  true);
 
- ctest_equal_bool("i18n_translate(L\"button.notfound\") == NULL)",
+ ctest_equal_bool("en: i18n_translate(L\"button.notfound\") == NULL)",
  i18n_translate(L"button.notfound")== NULL,
  true);
 
  i18n_change_language(L"zh-CN");
 
- ctest_equal_bool("i18n_translate(L\"name\") == L\"中文\")",
- wcscmp(i18n_translate(L"name"), L"中文") == 0,
+ ctest_equal_bool("zh-CN: i18n_translate(L\"name\")",
+ wcscmp(i18n_translate(L"name"), L"\u4E2D\u6587") == 0,
  true);
 
- ctest_equal_bool("i18n_translate(L\"button.ok\") == L\"确定\")",
- wcscmp(i18n_translate(L"button.ok"), L"确定") == 0,
+ ctest_equal_bool("zh-CN: i18n_translate(L\"button.ok\")",
+ wcscmp(i18n_translate(L"button.ok"), L"\u786E\u5B9A") == 0,
  true);
 
- ctest_equal_bool("i18n_translate(L\"button.notfound\") == NULL)",
+ ctest_equal_bool("zh-CN: i18n_translate(L\"button.notfound\") == NULL",
  i18n_translate(L"button.notfound")== NULL,
  true);
  i18n_clear();

diff --git a/lib/ui/src/ui.c b/lib/ui/src/ui.c
@@ -34,4 +34,5 @@ void ui_destroy(void)
  ui_destroy_widget_id();
  ui_destroy_widget_prototype();
  ui_destroy_css();
+ ui_destroy_updater();
 }