openharmony/commonlibrary_ets_utils
1
0
Fork 0
mirror of https://gitee.com/openharmony/commonlibrary_ets_utils synced 2025-02-09 03:28:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix static alarms in the basic library

Browse Source 
Signed-off-by: @lixingyang-li <lixingyang13@huawei.com>
https://gitee.com/openharmony/commonlibrary_ets_utils/issues/IA4F1W
This commit is contained in:
@lixingyang-li 2024-06-11 16:54:25 +08:00
parent ed4d587880
commit ca2b182a21
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
js_api_module/buffer/native_module_buffer.cpp
View File

@ -876,35 +876,33 @@ static napi_value ToBase64Url(napi_env env, napi_callback_info info)
return result;
}
uint32_t GetValue(napi_env env, EncodingType &eType, std::string &str, const char *&data, napi_value &args)
uint32_t GetValue(napi_env env, EncodingType &eType, std::string &str, napi_value &args)
{
std::u16string u16Str;
std::u16string u16Str = u"";
uint32_t len = 0;
const char *data = nullptr;
switch (eType) {
case ASCII:
case LATIN1:
case BINARY:
str = GetStringASCII(env, args);
data = str.c_str();
break;
case UTF8:
str = GetStringUtf8(env, args);
data = str.c_str();
break;
case UTF16LE: {
u16Str = GetStringUtf16LE(env, args);
data = reinterpret_cast<char *>(const_cast<char16_t *>(u16Str.c_str()));
str = data;
len = u16Str.length() * 2; // 2 : 2 means the length of wide char String is 2 times of char String
break;
}
case BASE64:
case BASE64URL:
str = GetStringBase64(env, args, eType);
data = str.c_str();
break;
case HEX:
str = GetStringHex(env, args);
data = str.c_str();
break;
default:
break;
@ -926,8 +924,8 @@ static napi_value IndexOf(napi_env env, napi_callback_info info)
EncodingType eType = Buffer::GetEncodingType(type);
std::string str = "";
uint32_t len = 0;
const char *data = nullptr;
len = GetValue(env, eType, str, data, args[0]);
len = GetValue(env, eType, str, args[0]);
const char *data = str.c_str();
Buffer *buf = nullptr;
NAPI_CALL(env, napi_unwrap(env, thisVar, reinterpret_cast<void **>(&buf)));
bool isReverse = false;

6
js_sys_module/process/js_process.cpp
View File

@ -47,8 +47,8 @@ namespace OHOS::JsSysModule::Process {
thread_local std::multimap<std::string, napi_ref> eventMap;
static std::mutex g_sharedTimedMutex;
thread_local std::map<napi_ref, napi_ref> pendingUnHandledRejections;
// support events
thread_local std::string events = "UnHandleRejection";
// support g_events
thread_local std::string g_events = "UnHandleRejection";
thread_local int g_processStartRealtime = 0;
napi_value Process::GetUid(napi_env env) const
@ -244,7 +244,7 @@ namespace OHOS::JsSysModule::Process {
return;
}
if (!result.empty()) {
size_t pos = events.find(result);
size_t pos = g_events.find(result);
if (pos == std::string::npos) {
HILOG_ERROR("illegal event");
return;