fix warnings

2020-03-10 08:34:07 +01:00
parent 48a4cc3fc6
commit 498f050262
27 changed files with 163 additions and 61 deletions
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -5,7 +5,7 @@ CC ?= gcc
 LVGL_DIR ?= ${shell pwd}/../..
 LVGL_DIR_NAME ?= lvgl

-WARNINGS ?= -Wall -Wextra
+WARNINGS ?= -Werror -Wall -Wextra -Wshadow -Wundef -Wmaybe-uninitialized -Wmissing-prototypes -Wno-discarded-qualifiers -Wall -Wextra -Wno-unused-function -Wundef -Wno-error=strict-prototypes -Wpointer-arith -fno-strict-aliasing -Wno-error=cpp -Wuninitialized -Wmaybe-uninitialized -Wno-unused-parameter -Wno-missing-field-initializers -Wtype-limits -Wsizeof-pointer-memaccess -Wno-format-nonliteral -Wno-cast-qual -Wunreachable-code -Wno-switch-default -Wno-switch-enum -Wreturn-type -Wmultichar -Wformat-security -Wno-ignored-qualifiers -Wno-error=pedantic -Wno-sign-compare -Wno-error=missing-prototypes -Wdouble-promotion -Wclobbered -Wdeprecated -Wempty-body -Wtype-limits -Wshift-negative-value -Wstack-usage=1024 -Wno-unused-value -Wno-unused-parameter -Wno-missing-field-initializers -Wuninitialized -Wmaybe-uninitialized -Wall -Wextra -Wno-unused-parameter -Wno-missing-field-initializers -Wtype-limits -Wsizeof-pointer-memaccess -Wno-format-nonliteral -Wpointer-arith -Wno-cast-qual -Wmissing-prototypes -Wunreachable-code -Wno-switch-default -Wswitch-enum -Wreturn-type -Wmultichar -Wno-discarded-qualifiers -Wformat-security -Wno-ignored-qualifiers -Wno-sign-compare
 OPTIMIZATION ?= -O3 -g0


--- a/tests/build.py
+++ b/tests/build.py
@@ -6,7 +6,6 @@ lvgldirname = os.path.abspath('..')
 lvgldirname = os.path.basename(lvgldirname)
 lvgldirname = '"' + lvgldirname + '"'

-warnings = '"-Wall -Werror"' 
 base_defines = '"-DLV_CONF_PATH=' + lvgldirname +'/tests/lv_test_conf.h -DLV_BUILD_TEST"'
 optimization = '"-O3 -g0"'

@@ -24,7 +23,7 @@ def build(name, defines):
    d_all += " -D" + d + "=" + str(defines[d])
  
  d_all += '"'
-  cmd = "make -j8 BIN=test.bin LVGL_DIR_NAME=" + lvgldirname + " DEFINES=" + d_all + " WARNINGS=" + warnings + " OPTIMIZATION=" + optimization
+  cmd = "make -j8 BIN=test.bin LVGL_DIR_NAME=" + lvgldirname + " DEFINES=" + d_all + " OPTIMIZATION=" + optimization
  
  print("---------------------------")
  print("Clean")
@@ -64,6 +63,7 @@ minimal_monochrome = {
  "LV_GPU":0,
  "LV_USE_FILESYSTEM":0,
  "LV_USE_USER_DATA":0,
+  "LV_USE_USER_DATA_FREE":0,
  "LV_USE_LOG":0,
  "LV_USE_THEME_MATERIAL":1,   
  "LV_THEME_DEFAULT_INIT": "\\\"lv_theme_material_init\\\"",
@@ -74,7 +74,13 @@ minimal_monochrome = {
  "LV_THEME_DEFAULT_FONT_NORMAL"   :     "\\\"&lv_font_unscii_8\\\"",
  "LV_THEME_DEFAULT_FONT_SUBTITLE" :     "\\\"&lv_font_unscii_8\\\"",
  "LV_THEME_DEFAULT_FONT_TITLE"    :     "\\\"&lv_font_unscii_8\\\"",
+  "LV_LOG_PRINTF":0,
  "LV_USE_DEBUG":0,
+  "LV_USE_ASSERT_NULL":0,
+  "LV_USE_ASSERT_MEM":0,
+  "LV_USE_ASSERT_STR":0,
+  "LV_USE_ASSERT_OBJ":0,
+  "LV_USE_ASSERT_STYLE":0,
  "LV_FONT_ROBOTO_12":0,
  "LV_FONT_ROBOTO_16":0,
  "LV_FONT_ROBOTO_22":0,
@@ -131,6 +137,7 @@ all_obj_minimal_features = {
  "LV_GPU":0,
  "LV_USE_FILESYSTEM":0,
  "LV_USE_USER_DATA":0,
+  "LV_USE_USER_DATA_FREE":0,
  "LV_USE_LOG":0,
  "LV_USE_THEME_MATERIAL":1,   
  "LV_THEME_DEFAULT_INIT": "\\\"lv_theme_material_init\\\"",
@@ -142,6 +149,11 @@ all_obj_minimal_features = {
  "LV_THEME_DEFAULT_FONT_SUBTITLE" :     "\\\"&lv_font_roboto_16\\\"",
  "LV_THEME_DEFAULT_FONT_TITLE"    :     "\\\"&lv_font_roboto_16\\\"",
  "LV_USE_DEBUG":0,
+  "LV_USE_ASSERT_NULL":0,
+  "LV_USE_ASSERT_MEM":0,
+  "LV_USE_ASSERT_STR":0,
+  "LV_USE_ASSERT_OBJ":0,
+  "LV_USE_ASSERT_STYLE":0,
  "LV_FONT_ROBOTO_12":0,
  "LV_FONT_ROBOTO_16":1,
  "LV_FONT_ROBOTO_22":0,
@@ -199,6 +211,7 @@ all_obj_all_features = {
  "LV_GPU":1,
  "LV_USE_FILESYSTEM":1,
  "LV_USE_USER_DATA":1,
+  "LV_USE_USER_DATA_FREE":0,
  "LV_USE_LOG":1,
  "LV_USE_THEME_MATERIAL":1,   
  "LV_THEME_DEFAULT_INIT": "\\\"lv_theme_material_init\\\"",
@@ -208,7 +221,14 @@ all_obj_all_features = {
  "LV_THEME_DEFAULT_FONT_SMALL"    :     "\\\"&lv_font_roboto_12\\\"",
  "LV_THEME_DEFAULT_FONT_NORMAL"   :     "\\\"&lv_font_roboto_16\\\"",
  "LV_THEME_DEFAULT_FONT_SUBTITLE" :     "\\\"&lv_font_roboto_22\\\"",
-  "LV_THEME_DEFAULT_FONT_TITLE"    :     "\\\"&lv_font_roboto_28\\\"",
+  "LV_THEME_DEFAULT_FONT_TITLE"    :     "\\\"&lv_font_roboto_28\\\"",  
+  "LV_LOG_PRINTF":0,
+  "LV_USE_DEBUG":0,
+  "LV_USE_ASSERT_NULL":0,
+  "LV_USE_ASSERT_MEM":0,
+  "LV_USE_ASSERT_STR":0,
+  "LV_USE_ASSERT_OBJ":0,
+  "LV_USE_ASSERT_STYLE":0,
  "LV_FONT_ROBOTO_12":1,
  "LV_FONT_ROBOTO_16":1,
  "LV_FONT_ROBOTO_22":1,
@@ -266,6 +286,9 @@ advanced_features = {
  "LV_GPU":1,
  "LV_USE_FILESYSTEM":1,
  "LV_USE_USER_DATA":1,
+  "LV_USE_USER_DATA_FREE":1,
+  "LV_USER_DATA_FREE_INCLUDE":"\\\"<stdio.h>\\\"",
+  "LV_USER_DATA_FREE": "\\\"free\\\"",
  "LV_IMG_CACHE_DEF_SIZE":32,
  "LV_USE_LOG":1,
  "LV_USE_THEME_MATERIAL":1,  
--- a/tests/lv_test_assert.c
+++ b/tests/lv_test_assert.c
@@ -47,9 +47,10 @@ typedef struct {
 /**********************
 *  STATIC PROTOTYPES
 **********************/
-void read_png_file(png_img_t * p, const char* file_name);
-void write_png_file(png_img_t * p, const char* file_name);
-void png_release(png_img_t * p);
+static void read_png_file(png_img_t * p, const char* file_name);
+static void write_png_file(png_img_t * p, const char* file_name);
+static void png_release(png_img_t * p);
+static void process_file(png_img_t * p);

 /**********************
 *  STATIC VARIABLES
@@ -200,7 +201,7 @@ void lv_test_assert_img_eq(const char * fn_ref, const char * s)
 *   STATIC FUNCTIONS
 **********************/

-void read_png_file(png_img_t * p, const char* file_name)
+static void read_png_file(png_img_t * p, const char* file_name)
 {
    char header[8];    // 8 is the maximum size that can be checked

@@ -255,7 +256,7 @@ void read_png_file(png_img_t * p, const char* file_name)
 }


-void write_png_file(png_img_t * p, const char* file_name)
+static void write_png_file(png_img_t * p, const char* file_name)
 {
    /* create file */
    FILE *fp = fopen(file_name, "wb");
@@ -306,7 +307,7 @@ void write_png_file(png_img_t * p, const char* file_name)
    fclose(fp);
 }

-void png_release(png_img_t * p)
+static void png_release(png_img_t * p)
 {
    int y;
      for (y=0; y<p->height; y++)
@@ -314,7 +315,7 @@ void png_release(png_img_t * p)
      free(p->row_pointers);
 }

-void process_file(png_img_t * p)
+static void process_file(png_img_t * p)
 {
    if (png_get_color_type(p->png_ptr, p->info_ptr) == PNG_COLOR_TYPE_RGB)
        lv_test_exit("[process_file] input file is PNG_COLOR_TYPE_RGB but must be PNG_COLOR_TYPE_RGBA "
--- a/tests/lv_test_core/lv_test_core.c
+++ b/tests/lv_test_core/lv_test_core.c
@@ -9,7 +9,7 @@
 #include "../lv_test_assert.h"

 #if LV_BUILD_TEST
-
+#include "lv_test_core.h"
 #include "lv_test_obj.h"
 #include "lv_test_style.h"

--- a/tests/lv_test_core/lv_test_obj.c
+++ b/tests/lv_test_core/lv_test_obj.c
@@ -8,6 +8,7 @@
 *********************/
 #include "../../lvgl.h"
 #include "../lv_test_assert.h"
+#include "lv_test_obj.h"

 #if LV_BUILD_TEST

--- a/tests/lv_test_core/lv_test_style.c
+++ b/tests/lv_test_core/lv_test_style.c
@@ -8,6 +8,7 @@
 *********************/
 #include "../../lvgl.h"
 #include "../lv_test_assert.h"
+#include "lv_test_style.h"

 #if LV_BUILD_TEST