From 38a71fef8f47f7d2fd0cb1554c0ec33a656e2161 Mon Sep 17 00:00:00 2001 From: huangyicong Date: Fri, 25 Mar 2022 15:56:32 +0800 Subject: [PATCH 1/2] change file permission Signed-off-by: huangyicong --- BUILD.gn | 0 LICENSE | 0 README.md | 0 README_zh.md | 0 file/BUILD.gn | 0 file/src/file_impl_hal/file.c | 0 hals/file/hal_file.h | 0 include/kv_store.h | 0 include/ohos_errno.h | 2 +- include/ohos_init.h | 0 include/ohos_types.h | 0 include/utils_config.h | 0 include/utils_file.h | 0 include/utils_list.h | 0 js/builtin/BUILD.gn | 0 js/builtin/CMakeLists.txt | 0 js/builtin/common/BUILD.gn | 0 js/builtin/common/include/nativeapi_common.h | 0 js/builtin/common/include/nativeapi_config.h | 0 js/builtin/common/src/nativeapi_common.cpp | 0 js/builtin/deviceinfokit/BUILD.gn | 0 js/builtin/deviceinfokit/include/nativeapi_deviceinfo.h | 0 js/builtin/deviceinfokit/src/nativeapi_deviceinfo.cpp | 2 +- js/builtin/filekit/BUILD.gn | 0 js/builtin/filekit/include/nativeapi_fs.h | 0 js/builtin/filekit/include/nativeapi_fs_impl.h | 0 js/builtin/filekit/src/nativeapi_fs.cpp | 2 +- js/builtin/filekit/src/nativeapi_fs_impl.c | 0 js/builtin/kvstorekit/BUILD.gn | 0 js/builtin/kvstorekit/include/nativeapi_kv.h | 0 js/builtin/kvstorekit/include/nativeapi_kv_impl.h | 0 js/builtin/kvstorekit/src/nativeapi_kv.cpp | 4 ++-- js/builtin/kvstorekit/src/nativeapi_kv_impl.c | 0 js/builtin/simulator/BUILD.gn | 0 kal/timer/BUILD.gn | 0 kal/timer/include/kal.h | 0 kal/timer/src/kal.c | 0 memory/include/ohos_mem_pool.h | 0 os_dump/BUILD.gn | 0 timer_task/BUILD.gn | 0 timer_task/include/nativeapi_timer_task.h | 0 timer_task/src/nativeapi_timer_task.c | 0 42 files changed, 5 insertions(+), 5 deletions(-) mode change 100755 => 100644 BUILD.gn mode change 100755 => 100644 LICENSE mode change 100755 => 100644 README.md mode change 100755 => 100644 README_zh.md mode change 100755 => 100644 file/BUILD.gn mode change 100755 => 100644 file/src/file_impl_hal/file.c mode change 100755 => 100644 hals/file/hal_file.h mode change 100755 => 100644 include/kv_store.h mode change 100755 => 100644 include/ohos_errno.h mode change 100755 => 100644 include/ohos_init.h mode change 100755 => 100644 include/ohos_types.h mode change 100755 => 100644 include/utils_config.h mode change 100755 => 100644 include/utils_file.h mode change 100755 => 100644 include/utils_list.h mode change 100755 => 100644 js/builtin/BUILD.gn mode change 100755 => 100644 js/builtin/CMakeLists.txt mode change 100755 => 100644 js/builtin/common/BUILD.gn mode change 100755 => 100644 js/builtin/common/include/nativeapi_common.h mode change 100755 => 100644 js/builtin/common/include/nativeapi_config.h mode change 100755 => 100644 js/builtin/common/src/nativeapi_common.cpp mode change 100755 => 100644 js/builtin/deviceinfokit/BUILD.gn mode change 100755 => 100644 js/builtin/deviceinfokit/include/nativeapi_deviceinfo.h mode change 100755 => 100644 js/builtin/deviceinfokit/src/nativeapi_deviceinfo.cpp mode change 100755 => 100644 js/builtin/filekit/BUILD.gn mode change 100755 => 100644 js/builtin/filekit/include/nativeapi_fs.h mode change 100755 => 100644 js/builtin/filekit/include/nativeapi_fs_impl.h mode change 100755 => 100644 js/builtin/filekit/src/nativeapi_fs.cpp mode change 100755 => 100644 js/builtin/filekit/src/nativeapi_fs_impl.c mode change 100755 => 100644 js/builtin/kvstorekit/BUILD.gn mode change 100755 => 100644 js/builtin/kvstorekit/include/nativeapi_kv.h mode change 100755 => 100644 js/builtin/kvstorekit/include/nativeapi_kv_impl.h mode change 100755 => 100644 js/builtin/kvstorekit/src/nativeapi_kv.cpp mode change 100755 => 100644 js/builtin/kvstorekit/src/nativeapi_kv_impl.c mode change 100755 => 100644 js/builtin/simulator/BUILD.gn mode change 100755 => 100644 kal/timer/BUILD.gn mode change 100755 => 100644 kal/timer/include/kal.h mode change 100755 => 100644 kal/timer/src/kal.c mode change 100755 => 100644 memory/include/ohos_mem_pool.h mode change 100755 => 100644 os_dump/BUILD.gn mode change 100755 => 100644 timer_task/BUILD.gn mode change 100755 => 100644 timer_task/include/nativeapi_timer_task.h mode change 100755 => 100644 timer_task/src/nativeapi_timer_task.c diff --git a/BUILD.gn b/BUILD.gn old mode 100755 new mode 100644 diff --git a/LICENSE b/LICENSE old mode 100755 new mode 100644 diff --git a/README.md b/README.md old mode 100755 new mode 100644 diff --git a/README_zh.md b/README_zh.md old mode 100755 new mode 100644 diff --git a/file/BUILD.gn b/file/BUILD.gn old mode 100755 new mode 100644 diff --git a/file/src/file_impl_hal/file.c b/file/src/file_impl_hal/file.c old mode 100755 new mode 100644 diff --git a/hals/file/hal_file.h b/hals/file/hal_file.h old mode 100755 new mode 100644 diff --git a/include/kv_store.h b/include/kv_store.h old mode 100755 new mode 100644 diff --git a/include/ohos_errno.h b/include/ohos_errno.h old mode 100755 new mode 100644 index 545a0e5..d6d5612 --- a/include/ohos_errno.h +++ b/include/ohos_errno.h @@ -30,7 +30,7 @@ enum OHOSLiteErrorCode { EC_ADDRESS = -4, /* Memory or bus address error */ EC_IOERROR = -5, /* I/O error */ EC_BUSBUSY = -6, /* xxx bus busy */ - EC_NORESPONCE = -7, /* Function is no responce */ + EC_NORESPONCE = -7, /* Function is no response */ EC_NODEVICE = -8, /* No such device */ EC_INVALID = -9, /* Invalid argument */ EC_BUSY = -10, /* Device or resource busy */ diff --git a/include/ohos_init.h b/include/ohos_init.h old mode 100755 new mode 100644 diff --git a/include/ohos_types.h b/include/ohos_types.h old mode 100755 new mode 100644 diff --git a/include/utils_config.h b/include/utils_config.h old mode 100755 new mode 100644 diff --git a/include/utils_file.h b/include/utils_file.h old mode 100755 new mode 100644 diff --git a/include/utils_list.h b/include/utils_list.h old mode 100755 new mode 100644 diff --git a/js/builtin/BUILD.gn b/js/builtin/BUILD.gn old mode 100755 new mode 100644 diff --git a/js/builtin/CMakeLists.txt b/js/builtin/CMakeLists.txt old mode 100755 new mode 100644 diff --git a/js/builtin/common/BUILD.gn b/js/builtin/common/BUILD.gn old mode 100755 new mode 100644 diff --git a/js/builtin/common/include/nativeapi_common.h b/js/builtin/common/include/nativeapi_common.h old mode 100755 new mode 100644 diff --git a/js/builtin/common/include/nativeapi_config.h b/js/builtin/common/include/nativeapi_config.h old mode 100755 new mode 100644 diff --git a/js/builtin/common/src/nativeapi_common.cpp b/js/builtin/common/src/nativeapi_common.cpp old mode 100755 new mode 100644 diff --git a/js/builtin/deviceinfokit/BUILD.gn b/js/builtin/deviceinfokit/BUILD.gn old mode 100755 new mode 100644 diff --git a/js/builtin/deviceinfokit/include/nativeapi_deviceinfo.h b/js/builtin/deviceinfokit/include/nativeapi_deviceinfo.h old mode 100755 new mode 100644 diff --git a/js/builtin/deviceinfokit/src/nativeapi_deviceinfo.cpp b/js/builtin/deviceinfokit/src/nativeapi_deviceinfo.cpp old mode 100755 new mode 100644 index 5e57858..57ca361 --- a/js/builtin/deviceinfokit/src/nativeapi_deviceinfo.cpp +++ b/js/builtin/deviceinfokit/src/nativeapi_deviceinfo.cpp @@ -32,7 +32,7 @@ JSIValue ExecuteAsyncWork(const JSIValue thisVal, const JSIValue* args, if (!NativeapiCommon::IsValidJSIValue(args, argsNum)) { return undefValue; } - FuncParams* params = new FuncParams(); + FuncParams* params = new(std::nothrow) FuncParams(); if (params == nullptr) { return undefValue; } diff --git a/js/builtin/filekit/BUILD.gn b/js/builtin/filekit/BUILD.gn old mode 100755 new mode 100644 diff --git a/js/builtin/filekit/include/nativeapi_fs.h b/js/builtin/filekit/include/nativeapi_fs.h old mode 100755 new mode 100644 diff --git a/js/builtin/filekit/include/nativeapi_fs_impl.h b/js/builtin/filekit/include/nativeapi_fs_impl.h old mode 100755 new mode 100644 diff --git a/js/builtin/filekit/src/nativeapi_fs.cpp b/js/builtin/filekit/src/nativeapi_fs.cpp old mode 100755 new mode 100644 index e10490c..7775e0e --- a/js/builtin/filekit/src/nativeapi_fs.cpp +++ b/js/builtin/filekit/src/nativeapi_fs.cpp @@ -73,7 +73,7 @@ JSIValue ExecuteAsyncWork(const JSIValue thisVal, const JSIValue* args, if (!NativeapiCommon::IsValidJSIValue(args, argsNum)) { return undefValue; } - FuncParams* params = new FuncParams(); + FuncParams* params = new(std::nothrow) FuncParams(); if (params == nullptr) { return undefValue; } diff --git a/js/builtin/filekit/src/nativeapi_fs_impl.c b/js/builtin/filekit/src/nativeapi_fs_impl.c old mode 100755 new mode 100644 diff --git a/js/builtin/kvstorekit/BUILD.gn b/js/builtin/kvstorekit/BUILD.gn old mode 100755 new mode 100644 diff --git a/js/builtin/kvstorekit/include/nativeapi_kv.h b/js/builtin/kvstorekit/include/nativeapi_kv.h old mode 100755 new mode 100644 diff --git a/js/builtin/kvstorekit/include/nativeapi_kv_impl.h b/js/builtin/kvstorekit/include/nativeapi_kv_impl.h old mode 100755 new mode 100644 diff --git a/js/builtin/kvstorekit/src/nativeapi_kv.cpp b/js/builtin/kvstorekit/src/nativeapi_kv.cpp old mode 100755 new mode 100644 index 4f5d4ab..417340d --- a/js/builtin/kvstorekit/src/nativeapi_kv.cpp +++ b/js/builtin/kvstorekit/src/nativeapi_kv.cpp @@ -103,7 +103,7 @@ JSIValue ExecuteAsyncWork(const JSIValue thisVal, const JSIValue* args, if (!NativeapiCommon::IsValidJSIValue(args, argsNum)) { return undefValue; } - FuncParams* params = new FuncParams(); + FuncParams* params = new(std::nothrow) FuncParams(); if (params == nullptr) { return undefValue; } @@ -277,7 +277,7 @@ JSIValue NativeapiKv::Delete(const JSIValue thisVal, const JSIValue* args, uint8 JSIValue NativeapiKv::Clear(const JSIValue thisVal, const JSIValue* args, uint8_t argsNum) { JSIValue undefValue = JSI::CreateUndefined(); - FuncParams* params = new FuncParams(); + FuncParams* params = new(std::nothrow) FuncParams(); if (params == nullptr) { return undefValue; } diff --git a/js/builtin/kvstorekit/src/nativeapi_kv_impl.c b/js/builtin/kvstorekit/src/nativeapi_kv_impl.c old mode 100755 new mode 100644 diff --git a/js/builtin/simulator/BUILD.gn b/js/builtin/simulator/BUILD.gn old mode 100755 new mode 100644 diff --git a/kal/timer/BUILD.gn b/kal/timer/BUILD.gn old mode 100755 new mode 100644 diff --git a/kal/timer/include/kal.h b/kal/timer/include/kal.h old mode 100755 new mode 100644 diff --git a/kal/timer/src/kal.c b/kal/timer/src/kal.c old mode 100755 new mode 100644 diff --git a/memory/include/ohos_mem_pool.h b/memory/include/ohos_mem_pool.h old mode 100755 new mode 100644 diff --git a/os_dump/BUILD.gn b/os_dump/BUILD.gn old mode 100755 new mode 100644 diff --git a/timer_task/BUILD.gn b/timer_task/BUILD.gn old mode 100755 new mode 100644 diff --git a/timer_task/include/nativeapi_timer_task.h b/timer_task/include/nativeapi_timer_task.h old mode 100755 new mode 100644 diff --git a/timer_task/src/nativeapi_timer_task.c b/timer_task/src/nativeapi_timer_task.c old mode 100755 new mode 100644 -- Gitee From 6847d550a0e8b5605f443c0a9ddad3923766de26 Mon Sep 17 00:00:00 2001 From: huangyicong Date: Fri, 25 Mar 2022 17:30:55 +0800 Subject: [PATCH 2/2] add std::nothrow Signed-off-by: huangyicong --- js/builtin/deviceinfokit/src/nativeapi_deviceinfo.cpp | 1 + js/builtin/filekit/src/nativeapi_fs.cpp | 1 + js/builtin/kvstorekit/src/nativeapi_kv.cpp | 1 + 3 files changed, 3 insertions(+) diff --git a/js/builtin/deviceinfokit/src/nativeapi_deviceinfo.cpp b/js/builtin/deviceinfokit/src/nativeapi_deviceinfo.cpp index 57ca361..d25453b 100644 --- a/js/builtin/deviceinfokit/src/nativeapi_deviceinfo.cpp +++ b/js/builtin/deviceinfokit/src/nativeapi_deviceinfo.cpp @@ -15,6 +15,7 @@ #include "nativeapi_deviceinfo.h" #include +#include #include "global.h" #include "js_async_work.h" #include "nativeapi_common.h" diff --git a/js/builtin/filekit/src/nativeapi_fs.cpp b/js/builtin/filekit/src/nativeapi_fs.cpp index 7775e0e..06d5fe1 100644 --- a/js/builtin/filekit/src/nativeapi_fs.cpp +++ b/js/builtin/filekit/src/nativeapi_fs.cpp @@ -15,6 +15,7 @@ #include "nativeapi_fs.h" #include +#include #include "ability_env.h" #include "js_async_work.h" #include "nativeapi_common.h" diff --git a/js/builtin/kvstorekit/src/nativeapi_kv.cpp b/js/builtin/kvstorekit/src/nativeapi_kv.cpp index 417340d..b0a439b 100644 --- a/js/builtin/kvstorekit/src/nativeapi_kv.cpp +++ b/js/builtin/kvstorekit/src/nativeapi_kv.cpp @@ -15,6 +15,7 @@ #include "nativeapi_kv.h" #include +#include #include "ability_env.h" #include "js_async_work.h" #include "nativeapi_common.h" -- Gitee