From 908fffc39d908dda8c74cdcc446c36e6ee719e42 Mon Sep 17 00:00:00 2001 From: i-wangliangliang Date: Sat, 9 Jul 2022 17:28:49 +0800 Subject: [PATCH] =?UTF-8?q?iccarm=E5=B7=A5=E5=85=B7=E9=93=BE=E7=BC=96?= =?UTF-8?q?=E8=AF=91=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: i-wangliangliang Change-Id: I8b9a1cf6caa805f944a2e7043cc5124c20f2989d --- file/src/file_impl_hal/file.c | 5 +++-- js/builtin/common/BUILD.gn | 2 -- js/builtin/deviceinfokit/BUILD.gn | 2 -- js/builtin/deviceinfokit/src/nativeapi_deviceinfo.cpp | 6 +++--- js/builtin/filekit/BUILD.gn | 2 -- js/builtin/filekit/src/nativeapi_fs.cpp | 2 +- js/builtin/kvstorekit/BUILD.gn | 2 -- js/builtin/simulator/BUILD.gn | 4 ---- kal/timer/BUILD.gn | 2 -- timer_task/BUILD.gn | 2 -- 10 files changed, 7 insertions(+), 22 deletions(-) diff --git a/file/src/file_impl_hal/file.c b/file/src/file_impl_hal/file.c index 6bce29b..cef74a2 100644 --- a/file/src/file_impl_hal/file.c +++ b/file/src/file_impl_hal/file.c @@ -73,11 +73,12 @@ int UtilsFileCopy(const char* src, const char* dest) return fpDest; } bool copyFailed = true; + int nLen; char* dataBuf = (char *)malloc(BUFFER_SIZE); if (dataBuf == NULL) { goto MALLOC_ERROR; } - int nLen = UtilsFileRead(fpSrc, dataBuf, BUFFER_SIZE); + nLen = UtilsFileRead(fpSrc, dataBuf, BUFFER_SIZE); while (nLen > 0) { if (UtilsFileWrite(fpDest, dataBuf, nLen) != nLen) { goto EXIT; @@ -105,4 +106,4 @@ int UtilsFileMove(const char* src, const char* dest) ret = UtilsFileDelete(src); } return ret; -} \ No newline at end of file +} diff --git a/js/builtin/common/BUILD.gn b/js/builtin/common/BUILD.gn index fb226b9..1c28449 100644 --- a/js/builtin/common/BUILD.gn +++ b/js/builtin/common/BUILD.gn @@ -22,8 +22,6 @@ lite_library("ace_kit_common") { target_type = "shared_library" } sources = [ "src/nativeapi_common.cpp" ] - cflags = [ "-Wall" ] - cflags_cc = cflags include_dirs = [ "include", "//foundation/arkui/ace_engine_lite/interfaces/inner_api/builtin", diff --git a/js/builtin/deviceinfokit/BUILD.gn b/js/builtin/deviceinfokit/BUILD.gn index 398a083..cf19e1c 100644 --- a/js/builtin/deviceinfokit/BUILD.gn +++ b/js/builtin/deviceinfokit/BUILD.gn @@ -22,8 +22,6 @@ lite_library("ace_kit_deviceinfo") { target_type = "shared_library" } sources = [ "src/nativeapi_deviceinfo.cpp" ] - cflags = [ "-Wall" ] - cflags_cc = cflags include_dirs = [ "include", diff --git a/js/builtin/deviceinfokit/src/nativeapi_deviceinfo.cpp b/js/builtin/deviceinfokit/src/nativeapi_deviceinfo.cpp index d25453b..0291b2e 100644 --- a/js/builtin/deviceinfokit/src/nativeapi_deviceinfo.cpp +++ b/js/builtin/deviceinfokit/src/nativeapi_deviceinfo.cpp @@ -130,12 +130,12 @@ bool NativeapiDeviceInfo::GetProductInfo(JSIValue result) } Screen &screen = Screen::GetInstance(); - JSI::SetNumberProperty(result, "windowWidth", (double)screen.GetWidth()); - JSI::SetNumberProperty(result, "windowHeight", (double)screen.GetHeight()); + JSI::SetNumberProperty(result, "windowWidth", static_cast(screen.GetWidth())); + JSI::SetNumberProperty(result, "windowHeight", static_cast(screen.GetHeight())); // set default value const uint8_t defaultScreenDensity = 195; const char * const defaultScreenShape = "rect"; - JSI::SetNumberProperty(result, "screenDensity", (double)defaultScreenDensity); + JSI::SetNumberProperty(result, "screenDensity", static_cast(defaultScreenDensity)); JSI::SetStringProperty(result, "screenShape", defaultScreenShape); return isSuccess; } diff --git a/js/builtin/filekit/BUILD.gn b/js/builtin/filekit/BUILD.gn index 3aacd05..32e40d2 100644 --- a/js/builtin/filekit/BUILD.gn +++ b/js/builtin/filekit/BUILD.gn @@ -26,8 +26,6 @@ lite_library("ace_kit_file") { "src/nativeapi_fs.cpp", "src/nativeapi_fs_impl.c", ] - cflags = [ "-Wall" ] - cflags_cc = cflags include_dirs = [ "include", diff --git a/js/builtin/filekit/src/nativeapi_fs.cpp b/js/builtin/filekit/src/nativeapi_fs.cpp index 06d5fe1..246cdfd 100644 --- a/js/builtin/filekit/src/nativeapi_fs.cpp +++ b/js/builtin/filekit/src/nativeapi_fs.cpp @@ -352,7 +352,7 @@ void ExecuteReadTextFile(void* data) double position = JSI::GetNumberProperty(args, FILE_POSITION); double length = JSI::GetNumberProperty(args, FILE_LENGTH); JSIValue result = JSI::CreateObject(); - int ret = ReadTextInner(src, position, length, result); + int ret = ReadTextInner(src, static_cast(position), static_cast(length), result); JSI::ReleaseString(src); if (ret == NATIVE_SUCCESS) { NativeapiCommon::SuccessCallBack(thisVal, args, result); diff --git a/js/builtin/kvstorekit/BUILD.gn b/js/builtin/kvstorekit/BUILD.gn index d4c009f..ce462bc 100644 --- a/js/builtin/kvstorekit/BUILD.gn +++ b/js/builtin/kvstorekit/BUILD.gn @@ -26,8 +26,6 @@ lite_library("ace_kit_kvstore") { "src/nativeapi_kv.cpp", "src/nativeapi_kv_impl.c", ] - cflags = [ "-Wall" ] - cflags_cc = cflags include_dirs = [ "include", diff --git a/js/builtin/simulator/BUILD.gn b/js/builtin/simulator/BUILD.gn index fd04244..54324e9 100644 --- a/js/builtin/simulator/BUILD.gn +++ b/js/builtin/simulator/BUILD.gn @@ -23,8 +23,6 @@ ohos_static_library("ace_kit_common_simulator") { "//foundation/arkui/ace_engine_lite/interfaces/inner_api/builtin/base", ] sources = [ "//utils/native/lite/js/builtin/common/src/nativeapi_common.cpp" ] - cflags = [ "-Wall" ] - cflags_cc = cflags } ohos_static_library("ace_kit_deviceinfo_simulator") { @@ -38,8 +36,6 @@ ohos_static_library("ace_kit_deviceinfo_simulator") { sources = [ "//utils/native/lite/js/builtin/deviceinfokit/src/nativeapi_deviceinfo.cpp", ] - cflags = [ "-Wall" ] - cflags_cc = cflags deps = [ "//foundation/arkui/ace_engine_lite/frameworks/targets/simulator:ace_lite", "//foundation/graphic/ui/huawei_proprietary/tools/ide:graphic_lite", diff --git a/kal/timer/BUILD.gn b/kal/timer/BUILD.gn index 119ef4d..70342f5 100644 --- a/kal/timer/BUILD.gn +++ b/kal/timer/BUILD.gn @@ -20,8 +20,6 @@ lite_library("kal_timer") { target_type = "shared_library" } sources = [ "src/kal.c" ] - cflags = [ "-Wall" ] - cflags_cc = cflags include_dirs = [ "include", diff --git a/timer_task/BUILD.gn b/timer_task/BUILD.gn index 33584a7..49dff87 100644 --- a/timer_task/BUILD.gn +++ b/timer_task/BUILD.gn @@ -20,8 +20,6 @@ lite_library("ace_kit_timer") { target_type = "shared_library" } sources = [ "src/nativeapi_timer_task.c" ] - cflags = [ "-Wall" ] - cflags_cc = cflags include_dirs = [ "include", -- Gitee