From 43f5cfc803c6d33934eb92975afcf338a616b44f Mon Sep 17 00:00:00 2001 From: wangkun Date: Fri, 22 Oct 2021 11:05:52 +0800 Subject: [PATCH] Fix the issue of variable naming convention Signed-off-by: wangkun --- frameworks/jskitsimpl/distributeddata/src/kv_manager.cpp | 8 ++++---- .../jskitsimpl/distributeddata/src/single_kv_store.cpp | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/frameworks/jskitsimpl/distributeddata/src/kv_manager.cpp b/frameworks/jskitsimpl/distributeddata/src/kv_manager.cpp index ca9f0307c..949a68adc 100644 --- a/frameworks/jskitsimpl/distributeddata/src/kv_manager.cpp +++ b/frameworks/jskitsimpl/distributeddata/src/kv_manager.cpp @@ -24,7 +24,7 @@ using namespace OHOS::DistributedKv; namespace OHOS::DistributedData { -static __thread napi_ref ctor_ = nullptr; +static __thread napi_ref g_ctor = nullptr; napi_value KVManager::CreateKVManager(napi_env env, napi_callback_info info) { ZLOGD("get kv manager!"); @@ -116,8 +116,8 @@ napi_value KVManager::GetKVStore(napi_env env, napi_callback_info info) napi_value KVManager::GetCtor(napi_env env) { napi_value cons; - if (ctor_ != nullptr) { - NAPI_CALL(env, napi_get_reference_value(env, ctor_, &cons)); + if (g_ctor != nullptr) { + NAPI_CALL(env, napi_get_reference_value(env, g_ctor, &cons)); return cons; } @@ -126,7 +126,7 @@ napi_value KVManager::GetCtor(napi_env env) }; NAPI_CALL(env, napi_define_class(env, "KVManager", NAPI_AUTO_LENGTH, Initialize, nullptr, sizeof(clzDes) / sizeof(napi_property_descriptor), clzDes, &cons)); - NAPI_CALL(env, napi_create_reference(env, cons, 1, &ctor_)); + NAPI_CALL(env, napi_create_reference(env, cons, 1, &g_ctor)); return cons; } diff --git a/frameworks/jskitsimpl/distributeddata/src/single_kv_store.cpp b/frameworks/jskitsimpl/distributeddata/src/single_kv_store.cpp index 9bb73f9df..7bc1175c9 100644 --- a/frameworks/jskitsimpl/distributeddata/src/single_kv_store.cpp +++ b/frameworks/jskitsimpl/distributeddata/src/single_kv_store.cpp @@ -22,7 +22,7 @@ using namespace OHOS::DistributedKv; namespace OHOS::DistributedData { -static __thread napi_ref ctor_ = nullptr; +static __thread napi_ref g_ctor = nullptr; std::map SingleKVStore::eventHandlers_ = { {"dataChange", SingleKVStore::OnDataChange}, {"syncComplete", SingleKVStore::OnSyncComplete}, @@ -48,9 +48,9 @@ SingleKVStore::~SingleKVStore() napi_value SingleKVStore::GetCtor(napi_env env) { - if (ctor_ != nullptr) { + if (g_ctor != nullptr) { napi_value cons = nullptr; - NAPI_CALL(env, napi_get_reference_value(env, ctor_, &cons)); + NAPI_CALL(env, napi_get_reference_value(env, g_ctor, &cons)); return cons; } @@ -64,7 +64,7 @@ napi_value SingleKVStore::GetCtor(napi_env env) napi_value cons; NAPI_CALL(env, napi_define_class(env, "SingleKVStore", NAPI_AUTO_LENGTH, Initialize, nullptr, sizeof(clzDes) / sizeof(napi_property_descriptor), clzDes, &cons)); - NAPI_CALL(env, napi_create_reference(env, cons, 1, &ctor_)); + NAPI_CALL(env, napi_create_reference(env, cons, 1, &g_ctor)); return cons; } -- Gitee