From ceaa0f88f3a6db68c973e8c09e9135f933350c54 Mon Sep 17 00:00:00 2001 From: lifansheng Date: Fri, 24 Sep 2021 19:23:42 +0800 Subject: [PATCH 1/3] Signed-off-by: lifansheng On branch master Your branch is up to date with 'origin/master'. Changes to be committed: modified: lrubuffer/native_module_lrubuffer.cpp modified: scope/native_module_scope.cpp modified: util/js_rational.cpp modified: util/js_textdecoder.cpp --- lrubuffer/native_module_lrubuffer.cpp | 3 +-- scope/native_module_scope.cpp | 3 +-- util/js_rational.cpp | 3 ++- util/js_textdecoder.cpp | 4 ++-- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/lrubuffer/native_module_lrubuffer.cpp b/lrubuffer/native_module_lrubuffer.cpp index eee051c..e8d8133 100755 --- a/lrubuffer/native_module_lrubuffer.cpp +++ b/lrubuffer/native_module_lrubuffer.cpp @@ -22,8 +22,7 @@ static napi_value LruBufferInit(napi_env env, napi_value exports) const char *lruBufferClassName = "lrubuffer"; napi_value lruBufferClass = nullptr; NAPI_CALL(env, napi_define_class(env, lruBufferClassName, strlen(lruBufferClassName), nullptr, - nullptr, 0, nullptr, - &lruBufferClass)); + nullptr, 0, nullptr, &lruBufferClass)); static napi_property_descriptor desc[] = { DECLARE_NAPI_PROPERTY("lrubuffer", lruBufferClass), }; diff --git a/scope/native_module_scope.cpp b/scope/native_module_scope.cpp index c3eff3e..7ade0e0 100755 --- a/scope/native_module_scope.cpp +++ b/scope/native_module_scope.cpp @@ -22,8 +22,7 @@ static napi_value ScopeInit(napi_env env, napi_value exports) const char *ClassName = "scope"; napi_value scopeClass = nullptr; NAPI_CALL(env, napi_define_class(env, ClassName, strlen(ClassName), nullptr, - nullptr, 0, nullptr, - &scopeClass)); + nullptr, 0, nullptr, &scopeClass)); static napi_property_descriptor desc[] = { DECLARE_NAPI_PROPERTY("scope", scopeClass) }; diff --git a/util/js_rational.cpp b/util/js_rational.cpp index 567c26f..8072fdc 100755 --- a/util/js_rational.cpp +++ b/util/js_rational.cpp @@ -24,7 +24,8 @@ namespace OHOS::Util { { env_ = env; napi_value result = nullptr; - den < 0 ? num *= -1, den *= -1 : 0; + num = den < 0 ? num * (-1) : num; + den = den < 0 ? den * (-1) : den; if (den == 0) { if (num > 0) { mnum = 1; diff --git a/util/js_textdecoder.cpp b/util/js_textdecoder.cpp index 4d3c9c6..8f38672 100755 --- a/util/js_textdecoder.cpp +++ b/util/js_textdecoder.cpp @@ -73,8 +73,8 @@ namespace OHOS::Util { NAPI_CALL(env_, napi_get_typedarray_info(env_, src, &type, &length, &data1, &arrayBuffer, &byteOffset)); const char *source = static_cast(data1); UErrorCode codeFlag = U_ZERO_ERROR; - size_t limit = GetMinByteSize() *length; - size_t len = limit *sizeof(UChar); + size_t limit = GetMinByteSize() * length; + size_t len = limit * sizeof(UChar); UChar *arr = nullptr; if (limit > 0) { arr = new UChar[limit + 1]; -- Gitee From c07c88f9f176460b6488eadabdf5cebd9055b01f Mon Sep 17 00:00:00 2001 From: lifansheng Date: Fri, 24 Sep 2021 20:00:53 +0800 Subject: [PATCH 2/3] Signed-off-by: lifansheng On branch master Your branch is up to date with 'origin/master'. Changes to be committed: modified: lrubuffer/native_module_lrubuffer.cpp modified: util/js_rational.cpp --- lrubuffer/native_module_lrubuffer.cpp | 2 +- util/js_rational.cpp | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/lrubuffer/native_module_lrubuffer.cpp b/lrubuffer/native_module_lrubuffer.cpp index e8d8133..cbd5a66 100755 --- a/lrubuffer/native_module_lrubuffer.cpp +++ b/lrubuffer/native_module_lrubuffer.cpp @@ -22,7 +22,7 @@ static napi_value LruBufferInit(napi_env env, napi_value exports) const char *lruBufferClassName = "lrubuffer"; napi_value lruBufferClass = nullptr; NAPI_CALL(env, napi_define_class(env, lruBufferClassName, strlen(lruBufferClassName), nullptr, - nullptr, 0, nullptr, &lruBufferClass)); + nullptr, 0, nullptr, &lruBufferClass)); static napi_property_descriptor desc[] = { DECLARE_NAPI_PROPERTY("lrubuffer", lruBufferClass), }; diff --git a/util/js_rational.cpp b/util/js_rational.cpp index 8072fdc..5449740 100755 --- a/util/js_rational.cpp +++ b/util/js_rational.cpp @@ -20,10 +20,12 @@ #include "utils/log.h" #include "securec.h" namespace OHOS::Util { - RationalNumber::RationalNumber(napi_env env, int num, int den) + RationalNumber::RationalNumber(napi_env env, int molecule, int denominator) { env_ = env; napi_value result = nullptr; + int num = molecule; + int den = denominator; num = den < 0 ? num * (-1) : num; den = den < 0 ? den * (-1) : den; if (den == 0) { -- Gitee From 35b9263b8fcce45781b2af5482df6683199d2566 Mon Sep 17 00:00:00 2001 From: lifansheng Date: Fri, 24 Sep 2021 20:04:08 +0800 Subject: [PATCH 3/3] Signed-off-by: lifansheng On branch master Your branch is up to date with 'origin/master'. Changes to be committed: modified: lrubuffer/native_module_lrubuffer.cpp modified: scope/native_module_scope.cpp modified: util/js_rational.cpp --- lrubuffer/native_module_lrubuffer.cpp | 2 +- scope/native_module_scope.cpp | 2 +- util/js_rational.cpp | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/lrubuffer/native_module_lrubuffer.cpp b/lrubuffer/native_module_lrubuffer.cpp index e8d8133..cbd5a66 100755 --- a/lrubuffer/native_module_lrubuffer.cpp +++ b/lrubuffer/native_module_lrubuffer.cpp @@ -22,7 +22,7 @@ static napi_value LruBufferInit(napi_env env, napi_value exports) const char *lruBufferClassName = "lrubuffer"; napi_value lruBufferClass = nullptr; NAPI_CALL(env, napi_define_class(env, lruBufferClassName, strlen(lruBufferClassName), nullptr, - nullptr, 0, nullptr, &lruBufferClass)); + nullptr, 0, nullptr, &lruBufferClass)); static napi_property_descriptor desc[] = { DECLARE_NAPI_PROPERTY("lrubuffer", lruBufferClass), }; diff --git a/scope/native_module_scope.cpp b/scope/native_module_scope.cpp index 7ade0e0..3dd9411 100755 --- a/scope/native_module_scope.cpp +++ b/scope/native_module_scope.cpp @@ -22,7 +22,7 @@ static napi_value ScopeInit(napi_env env, napi_value exports) const char *ClassName = "scope"; napi_value scopeClass = nullptr; NAPI_CALL(env, napi_define_class(env, ClassName, strlen(ClassName), nullptr, - nullptr, 0, nullptr, &scopeClass)); + nullptr, 0, nullptr, &scopeClass)); static napi_property_descriptor desc[] = { DECLARE_NAPI_PROPERTY("scope", scopeClass) }; diff --git a/util/js_rational.cpp b/util/js_rational.cpp index 8072fdc..5449740 100755 --- a/util/js_rational.cpp +++ b/util/js_rational.cpp @@ -20,10 +20,12 @@ #include "utils/log.h" #include "securec.h" namespace OHOS::Util { - RationalNumber::RationalNumber(napi_env env, int num, int den) + RationalNumber::RationalNumber(napi_env env, int molecule, int denominator) { env_ = env; napi_value result = nullptr; + int num = molecule; + int den = denominator; num = den < 0 ? num * (-1) : num; den = den < 0 ? den * (-1) : den; if (den == 0) { -- Gitee