Clear some warnings and enable -Werror for NuttX (#1756)

This commit is contained in:
Huang Qi 2022-11-28 09:44:33 +08:00 committed by GitHub
parent 1465901f6f
commit 93d3d09aa1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 20 additions and 13 deletions

View File

@ -55,12 +55,8 @@ jobs:
"boards/sim/sim/sim/configs/nsh", "boards/sim/sim/sim/configs/nsh",
# cortex-m0 # cortex-m0
"boards/arm/rp2040/raspberrypi-pico/configs/nsh", "boards/arm/rp2040/raspberrypi-pico/configs/nsh",
# cortex-m4
"boards/arm/stm32/stm32f4discovery/configs/nsh",
# cortex-m7 # cortex-m7
"boards/arm/stm32h7/nucleo-h743zi/configs/nsh", "boards/arm/stm32h7/nucleo-h743zi/configs/nsh",
# cortex-a9
"boards/arm/imx6/sabre-6quad/configs/nsh",
# riscv32imac # riscv32imac
"boards/risc-v/qemu-rv/rv-virt/configs/nsh", "boards/risc-v/qemu-rv/rv-virt/configs/nsh",
# riscv64imac # riscv64imac
@ -123,4 +119,4 @@ jobs:
run: | run: |
cd nuttx cd nuttx
tools/configure.sh ${{ matrix.nuttx_board_config }} tools/configure.sh ${{ matrix.nuttx_board_config }}
make -j$(nproc) make -j$(nproc) EXTRAFLAGS=-Werror

View File

@ -555,7 +555,7 @@ execute_func(WASMModuleInstanceCommon *module_inst, const char *name,
case VALUE_TYPE_FUNCREF: case VALUE_TYPE_FUNCREF:
{ {
if (argv1[k] != NULL_REF) if (argv1[k] != NULL_REF)
os_printf("%u:ref.func", argv1[k]); os_printf("%" PRIu32 ":ref.func", argv1[k]);
else else
os_printf("func:ref.null"); os_printf("func:ref.null");
k++; k++;

View File

@ -379,8 +379,13 @@ wasm_native_unregister_natives(const char *module_name,
bool bool
wasm_native_init() wasm_native_init()
{ {
#if WASM_ENABLE_SPEC_TEST != 0 || WASM_ENABLE_LIBC_BUILTIN != 0 \
|| WASM_ENABLE_BASE_LIB != 0 || WASM_ENABLE_LIBC_EMCC != 0 \
|| WASM_ENABLE_LIB_RATS != 0 || WASM_ENABLE_WASI_NN != 0 \
|| WASM_ENABLE_APP_FRAMEWORK != 0
NativeSymbol *native_symbols; NativeSymbol *native_symbols;
uint32 n_native_symbols; uint32 n_native_symbols;
#endif
#if WASM_ENABLE_LIBC_BUILTIN != 0 #if WASM_ENABLE_LIBC_BUILTIN != 0
n_native_symbols = get_libc_builtin_export_apis(&native_symbols); n_native_symbols = get_libc_builtin_export_apis(&native_symbols);
@ -456,9 +461,14 @@ wasm_native_init()
#endif #endif
return true; return true;
#if WASM_ENABLE_SPEC_TEST != 0 || WASM_ENABLE_LIBC_BUILTIN != 0 \
|| WASM_ENABLE_BASE_LIB != 0 || WASM_ENABLE_LIBC_EMCC != 0 \
|| WASM_ENABLE_LIB_RATS != 0 || WASM_ENABLE_WASI_NN != 0 \
|| WASM_ENABLE_APP_FRAMEWORK != 0
fail: fail:
wasm_native_destroy(); wasm_native_destroy();
return false; return false;
#endif
} }
void void

View File

@ -4094,8 +4094,9 @@ wasm_interp_call_wasm(WASMModuleInstance *module_inst, WASMExecEnv *exec_env,
if (argc < function->param_cell_num) { if (argc < function->param_cell_num) {
char buf[128]; char buf[128];
snprintf(buf, sizeof(buf), snprintf(buf, sizeof(buf),
"invalid argument count %u, must be no smaller than %u", argc, "invalid argument count %" PRIu32
function->param_cell_num); ", must be no smaller than %u",
argc, function->param_cell_num);
wasm_set_exception(module_inst, buf); wasm_set_exception(module_inst, buf);
return; return;
} }

View File

@ -952,13 +952,13 @@ print_wrapper(wasm_exec_env_t exec_env)
static void static void
print_i32_wrapper(wasm_exec_env_t exec_env, int32 i32) print_i32_wrapper(wasm_exec_env_t exec_env, int32 i32)
{ {
os_printf("in specttest.print_i32(%d)\n", i32); os_printf("in specttest.print_i32(%" PRId32 ")\n", i32);
} }
static void static void
print_i32_f32_wrapper(wasm_exec_env_t exec_env, int32 i32, float f32) print_i32_f32_wrapper(wasm_exec_env_t exec_env, int32 i32, float f32)
{ {
os_printf("in specttest.print_i32_f32(%d, %f)\n", i32, f32); os_printf("in specttest.print_i32_f32(%" PRId32 ", %f)\n", i32, f32);
} }
static void static void

View File

@ -102,6 +102,6 @@ void
bh_log_proc_mem(const char *function, uint32 line) bh_log_proc_mem(const char *function, uint32 line)
{ {
char prompt[128] = { 0 }; char prompt[128] = { 0 };
snprintf(prompt, sizeof(prompt), "[MEM] %s(...) L%u", function, line); snprintf(prompt, sizeof(prompt), "[MEM] %s(...) L%" PRIu32, function, line);
return bh_print_proc_mem(prompt); return bh_print_proc_mem(prompt);
} }

View File

@ -78,7 +78,7 @@ print_help()
} }
/* clang-format on */ /* clang-format on */
static void * static const void *
app_instance_main(wasm_module_inst_t module_inst) app_instance_main(wasm_module_inst_t module_inst)
{ {
const char *exception; const char *exception;
@ -89,7 +89,7 @@ app_instance_main(wasm_module_inst_t module_inst)
return exception; return exception;
} }
static void * static const void *
app_instance_func(wasm_module_inst_t module_inst, const char *func_name) app_instance_func(wasm_module_inst_t module_inst, const char *func_name)
{ {
wasm_application_execute_func(module_inst, func_name, app_argc - 1, wasm_application_execute_func(module_inst, func_name, app_argc - 1,