diff --git a/api/js_uri.cpp b/api/js_uri.cpp index 852063d..306c118 100755 --- a/api/js_uri.cpp +++ b/api/js_uri.cpp @@ -14,9 +14,7 @@ */ #include "js_uri.h" #include "utils/log.h" - namespace OHOS::Api { - std::bitset g_ruleAlpha; std::bitset g_ruleScheme; std::bitset g_ruleUrlc; @@ -74,7 +72,6 @@ namespace OHOS::Api { env_ = env; errStr_ = ""; if (input.empty()) { - napi_throw_error(env_, nullptr, "uri is empty"); errStr_ = "uri is empty"; return; } @@ -91,24 +88,18 @@ namespace OHOS::Api { if (pos != 0) { AnalysisFragment(pos); } else { - HILOG_INFO("CJX -------CPP----- AnalysisUri throw err"); - napi_throw_error(env_, nullptr, "#It can't be the first"); errStr_ = "#It can't be the first"; - HILOG_INFO("CJX -------CPP----- AnalysisUri throw err end"); return; } } - - // Query - pos = data_.find('?'); + pos = data_.find('?'); // Query if (pos != std::string::npos) { AnalysisQuery(pos); if (!errStr_.empty()) { return; } } - //Scheme - pos = data_.find(':'); + pos = data_.find(':'); // Scheme if (pos != std::string::npos) { AnalysisScheme(pos); if (!errStr_.empty()) { @@ -122,7 +113,6 @@ namespace OHOS::Api { uriData_.SchemeSpecificPart = data_ + "?" + uriData_.query; return; } - // userInfo path host port ipv4 or ipv6 pos = data_.find("//"); if (pos != std::string::npos && pos == 0) { @@ -164,7 +154,6 @@ namespace OHOS::Api { void Uri::SpecialPath() { if (!CheckCharacter(data_, g_rulePath, true)) { - napi_throw_error(env_, nullptr, "SpecialPath does not conform to the rule"); errStr_ = "SpecialPath does not conform to the rule"; return; } @@ -176,7 +165,6 @@ namespace OHOS::Api { { std::string fragment = data_.substr(pos + 1); if (!CheckCharacter(fragment, g_ruleUrlc, true)) { - napi_throw_error(env_, nullptr, "Fragment does not conform to the rule"); errStr_ = "Fragment does not conform to the rule"; return; } @@ -188,7 +176,6 @@ namespace OHOS::Api { { std::string query = data_.substr(pos + 1); if (!CheckCharacter(query, g_ruleUrlc, true)) { - napi_throw_error(env_, nullptr, "Query does not conform to the rule"); errStr_ = "Query does not conform to the rule"; return; } @@ -205,13 +192,11 @@ namespace OHOS::Api { data_ = ""; } else { if (!g_ruleAlpha.test(data_[0])) { - napi_throw_error(env_, nullptr, "Scheme the first character must be a letter"); errStr_ = "Scheme the first character must be a letter"; return; } std::string scheme = data_.substr(0, pos); if (!CheckCharacter(scheme, g_ruleScheme, false)) { - napi_throw_error(env_, nullptr, "scheme does not conform to the rule"); errStr_ = "scheme does not conform to the rule"; return; } @@ -257,15 +242,13 @@ namespace OHOS::Api { // find ipv4 or ipv6 or host if (data_[0] == '[') { if (data_[data_.size() - 1] == ']') { - //IPV6 + // IPV6 if (!isLawfulProt) { - napi_throw_error(env_, nullptr, "ipv6 does not conform to the rule"); errStr_ = "ipv6 does not conform to the rule"; return; } AnalysisIPV6(); } else { - napi_throw_error(env_, nullptr, "ipv6 does not conform to the rule"); errStr_ = "ipv6 does not conform to the rule"; return; } @@ -283,7 +266,6 @@ namespace OHOS::Api { { std::string path = data_.substr(pos); if (!CheckCharacter(path, g_rulePath, true)) { - napi_throw_error(env_, nullptr, "path does not conform to the rule"); errStr_ = "path does not conform to the rule"; return; } @@ -295,7 +277,6 @@ namespace OHOS::Api { { std::string userInfo = data_.substr(0, pos); if (!CheckCharacter(userInfo, g_ruleUserInfo, true)) { - napi_throw_error(env_, nullptr, "userInfo does not conform to the rule"); errStr_ = "userInfo does not conform to the rule"; return; } @@ -307,7 +288,6 @@ namespace OHOS::Api { { std::string port = data_.substr(pos + 1); if (!CheckCharacter(port, g_rulePort, true)) { // 存在非规则内字符 - napi_throw_error(env_, nullptr, "port does not conform to the rule"); errStr_ = "port does not conform to the rule"; return false; } else if (CheckCharacter(port, g_ruleDigit, false)) { // 纯数字 @@ -335,11 +315,11 @@ namespace OHOS::Api { return true; } } - + void Uri::AnalysisIPV6() { std::string str = data_.substr(1, data_.size() - 2); // 2:Intercept the string from the second subscript - std::regex ipv6("(::|(:((:[0-9A-Fa-f]{1,4}){1,7}))|(([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|" + std::regex ipv6("^(::|(:((:[0-9A-Fa-f]{1,4}){1,7}))|(([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|" "(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|:))|(([0-9A-Fa-f]{1,4}:){2}" "(((:[0-9A-Fa-f]{1,4}){1,5})|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})" "|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|:))|(([0-9A-Fa-f]{1,4}:){5}" @@ -348,9 +328,8 @@ namespace OHOS::Api { "|(([0-9A-Fa-f]{1,4}:){2}(:[0-9A-Fa-f]{1,4}){0,3}:)|(([0-9A-Fa-f]{1,4}:){3}" "(:[0-9A-Fa-f]{1,4}){0,2}:)|(([0-9A-Fa-f]{1,4}:){4}(:[0-9A-Fa-f]{1,4})?:)|" "(([0-9A-Fa-f]{1,4}:){5}:)|(([0-9A-Fa-f]{1,4}:){6}))((25[0-5]|2[0-4]\\d|1\\d{2}|" - "[1-9]\\d|\\d)\\.){3}(25[0-5]|2[0-4]\\d|1\\d{2}|[1-9]\\d|\\d)))(%([0-9A-Fa-f]|.|_)+)?"); + "[1-9]\\d|\\d)\\.){3}(25[0-5]|2[0-4]\\d|1\\d{2}|[1-9]\\d|\\d)))(%[a-zA-Z0-9._]+)?$"); if (!std::regex_match(str, ipv6)) { - napi_throw_error(env_, nullptr, "ipv6 does not conform to the rule"); errStr_ = "ipv6 does not conform to the rule"; return; } diff --git a/api/js_uri.h b/api/js_uri.h index c23d28a..7ed76de 100755 --- a/api/js_uri.h +++ b/api/js_uri.h @@ -25,11 +25,8 @@ #include #include "napi/native_api.h" #include "napi/native_node_api.h" - namespace OHOS::Api { - namespace { - constexpr int MAX_BIT_SIZE = 128; - } + constexpr int MAX_BIT_SIZE = 128; struct uri_data { int port = -1; std::string scheme = ""; diff --git a/api/js_url.cpp b/api/js_url.cpp index d7a6288..1fee49b 100755 --- a/api/js_url.cpp +++ b/api/js_url.cpp @@ -87,8 +87,8 @@ namespace OHOS::Api { return temp; } temp.reserve(len); - const char* it = input; - const char* end = input + len; + const char *it = input; + const char *end = input + len; while (it < end) { const char ch = it[0]; size_t left = end - it - 1; @@ -162,11 +162,13 @@ namespace OHOS::Api { } else { size_t strlen = input.size(); for (size_t i = 0; i < strlen - 1; ++i) { - if ((isalnum(input[i]) || input[i] == '+' || input[i] == '-' || input[i] == '.') && isupper(input[i])) { + if ((isalnum(input[i]) || input[i] == '+' || input[i] == '-' || input[i] == '.') && + isupper(input[i])) { input[i] = tolower(input[i]); } if (!isalnum(input[i]) && input[i] != '+' && input[i] != '-' && input[i] != '.') { - flags.set(static_cast(BitsetStatusFlag::BIT0)); // 0:Bit 0 Set to true,The URL analysis failed + flags.set(static_cast(BitsetStatusFlag::BIT0)); + // 0:Bit 0 Set to true,The URL analysis failed return false; } } @@ -609,7 +611,7 @@ namespace OHOS::Api { std::bitset(BitsetStatusFlag::BIT_STATUS_11)> &flags) { int count = 0; - for (const char* ptr = instr; *ptr != '\0'; ptr++) { + for (const char *ptr = instr; *ptr != '\0'; ptr++) { if (*ptr == '.') { if (++count > 3) { // 3:The IPV4 address has only four segments return false; @@ -1158,7 +1160,7 @@ namespace OHOS::Api { napi_value URL::GetHostname() const { napi_value result; - const char* temp = nullptr; + const char *temp = nullptr; if (flags_.test(static_cast(BitsetStatusFlag::BIT4))) { temp = urlData_.host.c_str(); } else { @@ -1172,7 +1174,7 @@ namespace OHOS::Api { napi_value URL::GetSearch() const { napi_value result; - const char* temp = nullptr; + const char *temp = nullptr; if (flags_.test(static_cast(BitsetStatusFlag::BIT7))) { if (urlData_.query.size() == 1) { temp = ""; @@ -1190,7 +1192,7 @@ namespace OHOS::Api { napi_value URL::GetUsername() const { napi_value result; - const char* temp = nullptr; + const char *temp = nullptr; if (flags_.test(static_cast(BitsetStatusFlag::BIT2))) { temp = urlData_.username.c_str(); } else @@ -1203,7 +1205,7 @@ namespace OHOS::Api { napi_value URL::GetPassword() const { napi_value result; - const char* temp = nullptr; + const char *temp = nullptr; if (flags_.test(static_cast(BitsetStatusFlag::BIT3))) { temp = urlData_.password.c_str(); } else { @@ -1217,7 +1219,7 @@ namespace OHOS::Api { napi_value URL::GetFragment() const { napi_value result; - const char* temp = nullptr; + const char *temp = nullptr; if (flags_.test(static_cast(BitsetStatusFlag::BIT8))) { if (urlData_.fragment.size() == 1) { temp = ""; @@ -1235,7 +1237,7 @@ namespace OHOS::Api { napi_value URL::GetScheme() const { napi_value result; - const char* temp = nullptr; + const char *temp = nullptr; if (!urlData_.scheme.empty()) { temp = urlData_.scheme.c_str(); } else { @@ -1273,7 +1275,7 @@ namespace OHOS::Api { napi_value URL::GetPort() const { napi_value result; - const char* temp = nullptr; + const char *temp = nullptr; if (flags_.test(static_cast(BitsetStatusFlag::BIT5))) { temp = std::to_string(urlData_.port).c_str(); } else { @@ -1630,7 +1632,10 @@ namespace OHOS::Api { {} std::wstring StrToWstr(const std::string& str) { - setlocale(LC_ALL, ""); + char *p = setlocale(LC_ALL, ""); + if (p == nullptr) { + return L""; + } std::wstring wstr = L""; size_t len = str.size() + 1; if (len > 0) { @@ -1638,7 +1643,10 @@ namespace OHOS::Api { mbstowcs(wch, str.c_str(), len); wstr = wch; delete[] wch; - setlocale(LC_ALL, ""); + p = setlocale(LC_ALL, ""); + if (p == nullptr) { + return L""; + } return wstr; } return wstr; @@ -1668,7 +1676,7 @@ namespace OHOS::Api { auto charaEncode = static_cast(wch); return charaEncode; } - std::string ReviseStr(std::string str, std::string* reviseChar) + std::string ReviseStr(std::string str, std::string *reviseChar) { const size_t lenStr = str.length(); if (lenStr == 0) { @@ -1696,7 +1704,7 @@ namespace OHOS::Api { (charaEncode & 0x0000003F)]; // Acquisition method of the second byte output += output1 + output2; } else if ((charaEncode >= 0x0000E000) || - (charaEncode <= 0x0000D7FF)) { // Convert the Unicode code into three bytes + (charaEncode <= 0x0000D7FF)) { // Convert the Unicode code into three bytes std::string output1 = reviseChar[0x000000E0 | (charaEncode / 4096)]; // 4096:Acquisition method of the first byte std::string output2 = reviseChar[numOfAscii | @@ -1786,7 +1794,7 @@ namespace OHOS::Api { std::string URLSearchParams::ToUSVString(std::string inputStr) { size_t strLen = strlen(inputStr.c_str()); - wchar_t* strPtr = nullptr; + wchar_t *strPtr = nullptr; std::wstring winput = L""; int strSize = mbstowcs(strPtr, inputStr.c_str(), 0) + 1; if (strSize > 0) { @@ -1794,9 +1802,9 @@ namespace OHOS::Api { mbstowcs(strPtr, inputStr.c_str(), strLen); winput = strPtr; } - const char* expr = "(?:[^\\uD800-\\uDBFF]|^)[\\uDC00-\\uDFFF]|[\\uD800-\\uDBFF](?![\\uDC00-\\uDFFF])"; + const char *expr = "(?:[^\\uD800-\\uDBFF]|^)[\\uDC00-\\uDFFF]|[\\uD800-\\uDBFF](?![\\uDC00-\\uDFFF])"; size_t exprLen = strlen(expr); - wchar_t* exprPtr = nullptr; + wchar_t *exprPtr = nullptr; int exprSize = mbstowcs(exprPtr, expr, 0) + 1; if (exprSize > 0) { exprPtr = new wchar_t[exprSize]; @@ -1813,7 +1821,7 @@ namespace OHOS::Api { } HandleIllegalChar(winput, result[0].first); size_t inputLen = wcslen(winput.c_str()); - char* rePtr = nullptr; + char *rePtr = nullptr; std::string reStr = ""; int reSize = wcstombs(rePtr, winput.c_str(), 0) + 1; if (reSize > 0) { @@ -1832,7 +1840,7 @@ namespace OHOS::Api { } napi_value URLSearchParams::Get(napi_value buffer) { - char* name = nullptr; + char *name = nullptr; size_t nameSize = 0; std::string temp = ""; napi_get_value_string_utf8(env, buffer, nullptr, 0, &nameSize); @@ -1859,7 +1867,7 @@ namespace OHOS::Api { } napi_value URLSearchParams::GetAll(napi_value buffer) { - char* name = nullptr; + char *name = nullptr; size_t nameSize = 0; std::string sname = ""; napi_get_value_string_utf8(env, buffer, nullptr, 0, &nameSize); @@ -1891,7 +1899,7 @@ namespace OHOS::Api { } void URLSearchParams::Append(napi_value buffer, napi_value temp) { - char* name = nullptr; + char *name = nullptr; size_t nameSize = 0; std::string tempName = ""; std::string tempValue = ""; @@ -1901,7 +1909,7 @@ namespace OHOS::Api { napi_get_value_string_utf8(env, buffer, name, nameSize + 1, &nameSize); tempName = name; } - char* value = nullptr; + char *value = nullptr; size_t valueSize = 0; napi_get_value_string_utf8(env, temp, nullptr, 0, &valueSize); if (valueSize > 0) { @@ -1916,7 +1924,7 @@ namespace OHOS::Api { } void URLSearchParams::Delete(napi_value buffer) { - char* name = nullptr; + char *name = nullptr; size_t nameSize = 0; std::string sname = ""; napi_get_value_string_utf8(env, buffer, nullptr, 0, &nameSize); @@ -1977,7 +1985,7 @@ namespace OHOS::Api { } napi_value URLSearchParams::IsHas(napi_value name) const { - char* buffer = nullptr; + char *buffer = nullptr; size_t bufferSize = 0; std::string buf = ""; napi_get_value_string_utf8(env, name, nullptr, 0, &bufferSize); @@ -2002,7 +2010,7 @@ namespace OHOS::Api { } void URLSearchParams::Set(napi_value name, napi_value value) { - char* buffer0 = nullptr; + char *buffer0 = nullptr; size_t bufferSize0 = 0; std::string cppName = ""; std::string cppValue = ""; @@ -2013,7 +2021,7 @@ namespace OHOS::Api { cppName = buffer0; delete[] buffer0; } - char* buffer1 = nullptr; + char *buffer1 = nullptr; size_t bufferSize1 = 0; napi_get_value_string_utf8(env, value, nullptr, 0, &bufferSize1); if (bufferSize1 > 0) { @@ -2072,7 +2080,7 @@ namespace OHOS::Api { size_t stepSize = 2; // 2:Searching for the number and number of keys and values size_t lenStr = searchParams.size(); if (lenStr % 2 == 0) { // 2:Get the number of values - for (std::vector::iterator it = searchParams.begin(); it != searchParams.end(); it += stepSize) { + for (auto it = searchParams.begin(); it != searchParams.end(); it += stepSize) { toKeys.push_back(*it); } size_t lenToKeys = toKeys.size(); @@ -2092,7 +2100,9 @@ namespace OHOS::Api { size_t stepSize = 2; // 2:Searching for the number and number of keys and values size_t lenStr = searchParams.size(); if (lenStr % 2 == 0) { // 2:Get the number of values - for (std::vector::iterator it = searchParams.begin(); it != searchParams.end(); it += stepSize) { + for (auto it = searchParams.begin(); + it != searchParams.end(); + it += stepSize) { toKeys.push_back(*(it + 1)); } size_t lenToKeys = toKeys.size(); diff --git a/api/js_url.h b/api/js_url.h index 2b45c7a..f306f3e 100755 --- a/api/js_url.h +++ b/api/js_url.h @@ -25,9 +25,7 @@ #include #include "napi/native_api.h" #include "napi/native_node_api.h" - namespace OHOS::Api { - enum class BitsetStatusFlag { BIT0 = 0, // 0:Bit 0 Set to true,The URL analysis failed BIT1 = 1, // 1:Bit 1 Set to true,The protocol is the default protocol diff --git a/api/native_module_api.cpp b/api/native_module_api.cpp index 2f1ae55..509cf7f 100755 --- a/api/native_module_api.cpp +++ b/api/native_module_api.cpp @@ -1,16 +1,16 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + *Copyright (c) 2021 Huawei Device Co., Ltd. + *Licensed under the Apache License, Version 2.0 (the "License"); + *you may not use this file except in compliance with the License. + *You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + *See the License for the specific language governing permissions and + *limitations under the License. */ #include "napi/native_api.h" @@ -21,9 +21,7 @@ extern const char _binary_js_api_js_start[]; extern const char _binary_js_api_js_end[]; - namespace OHOS::Api { - napi_value g_uriClass = nullptr; static napi_value UriConstructor(napi_env env, napi_callback_info info) { @@ -47,12 +45,12 @@ namespace OHOS::Api { napi_throw_error(env, nullptr, "parameter type is error"); } NAPI_CALL(env, napi_wrap(env, thisVar, object, - [](napi_env env, void* data, void* hint) { - auto object = (Uri*)data; - if (object != nullptr) { - delete object; - } - }, nullptr, nullptr)); + [](napi_env env, void *data, void *hint) { + auto object = (Uri*)data; + if (object != nullptr) { + delete object; + } + }, nullptr, nullptr)); return thisVar; } @@ -106,7 +104,7 @@ namespace OHOS::Api { napi_value thisVar = nullptr; napi_value result = nullptr; NAPI_CALL(env, napi_get_cb_info(env, info, nullptr, nullptr, &thisVar, nullptr)); - Uri* muri = nullptr; + Uri *muri = nullptr; NAPI_CALL(env, napi_unwrap(env, thisVar, (void**)&muri)); std::string temp = muri->IsFailed(); size_t templen = temp.size(); @@ -244,12 +242,12 @@ namespace OHOS::Api { return result; } - static void UrlStructor(napi_env &env, napi_callback_info &info, URL* &object) + static void UrlStructor(napi_env &env, napi_callback_info &info, URL *&object) { napi_value thisVar = nullptr; size_t argc = 2; napi_value argv[2] = { 0 }; - void* data = nullptr; + void *data = nullptr; napi_get_cb_info(env, info, &argc, nullptr, &thisVar, &data); napi_get_cb_info(env, info, &argc, argv, &thisVar, &data); napi_valuetype valuetype1; @@ -257,7 +255,7 @@ namespace OHOS::Api { std::string input = ""; napi_typeof(env, argv[0], &valuetype1); if (valuetype1 == napi_string) { - char* tem = nullptr; + char *tem = nullptr; size_t temlen = 0; napi_get_value_string_utf8(env, argv[0], nullptr, 0, &temlen); if (temlen > 0) { @@ -269,7 +267,7 @@ namespace OHOS::Api { napi_typeof(env, argv[1], &valuetype2); if (valuetype2 == napi_string) { std::string base = ""; - char* type1 = nullptr; + char *type1 = nullptr; size_t typelen1 = 0; napi_get_value_string_utf8(env, argv[1], nullptr, 0, &typelen1); if (typelen1 > 0) { @@ -280,7 +278,7 @@ namespace OHOS::Api { } object = new URL(env, input, base); } else if (valuetype2 == napi_object) { - URL* temp = nullptr; + URL *temp = nullptr; napi_unwrap(env, argv[1], (void**)&temp); object = new URL(env, input, *temp); } else { @@ -295,10 +293,10 @@ namespace OHOS::Api { static napi_value UrlConstructor(napi_env env, napi_callback_info info) { napi_value thisVar = nullptr; - void* data = nullptr; + void *data = nullptr; size_t argc = 0; napi_value argv[2] = { 0 }; - URL* object = nullptr; + URL *object = nullptr; NAPI_CALL(env, napi_get_cb_info(env, info, &argc, nullptr, &thisVar, &data)); if (argc == 1) { std::string input = ""; @@ -306,7 +304,7 @@ namespace OHOS::Api { napi_valuetype valuetype; NAPI_CALL(env, napi_typeof(env, argv[0], &valuetype)); if (valuetype == napi_string) { - char* type = nullptr; + char *type = nullptr; size_t typelen = 0; NAPI_CALL(env, napi_get_value_string_utf8(env, argv[0], nullptr, 0, &typelen)); if (typelen > 0) { @@ -324,7 +322,7 @@ namespace OHOS::Api { } napi_wrap( env, thisVar, object, - [](napi_env env, void* data, void* hint) { + [](napi_env env, void *data, void *hint) { auto object = (URL*)data; if (object != nullptr) { delete object; @@ -338,7 +336,7 @@ namespace OHOS::Api { { napi_value thisVar = nullptr; NAPI_CALL(env, napi_get_cb_info(env, info, nullptr, nullptr, &thisVar, nullptr)); - URL* murl = nullptr; + URL *murl = nullptr; NAPI_CALL(env, napi_unwrap(env, thisVar, (void**)&murl)); napi_value retVal = murl->GetHostname(); return retVal; @@ -348,7 +346,7 @@ namespace OHOS::Api { { napi_value thisVar = nullptr; NAPI_CALL(env, napi_get_cb_info(env, info, nullptr, nullptr, &thisVar, nullptr)); - URL* murl = nullptr; + URL *murl = nullptr; NAPI_CALL(env, napi_unwrap(env, thisVar, (void**)&murl)); napi_value retVal = murl->GetSearch(); return retVal; @@ -358,7 +356,7 @@ namespace OHOS::Api { { napi_value thisVar = nullptr; NAPI_CALL(env, napi_get_cb_info(env, info, nullptr, nullptr, &thisVar, nullptr)); - URL* murl = nullptr; + URL *murl = nullptr; NAPI_CALL(env, napi_unwrap(env, thisVar, (void**)&murl)); napi_value retVal = murl->GetUsername(); return retVal; @@ -368,7 +366,7 @@ namespace OHOS::Api { { napi_value thisVar = nullptr; NAPI_CALL(env, napi_get_cb_info(env, info, nullptr, nullptr, &thisVar, nullptr)); - URL* murl = nullptr; + URL *murl = nullptr; NAPI_CALL(env, napi_unwrap(env, thisVar, (void**)&murl)); napi_value retVal = murl->GetPassword(); return retVal; @@ -378,7 +376,7 @@ namespace OHOS::Api { { napi_value thisVar = nullptr; NAPI_CALL(env, napi_get_cb_info(env, info, nullptr, nullptr, &thisVar, nullptr)); - URL* murl = nullptr; + URL *murl = nullptr; NAPI_CALL(env, napi_unwrap(env, thisVar, (void**)&murl)); napi_value retVal = murl->GetFragment(); return retVal; @@ -388,7 +386,7 @@ namespace OHOS::Api { { napi_value thisVar = nullptr; NAPI_CALL(env, napi_get_cb_info(env, info, nullptr, nullptr, &thisVar, nullptr)); - URL* murl = nullptr; + URL *murl = nullptr; NAPI_CALL(env, napi_unwrap(env, thisVar, (void**)&murl)); napi_value retVal = murl->GetScheme(); return retVal; @@ -398,7 +396,7 @@ namespace OHOS::Api { { napi_value thisVar = nullptr; NAPI_CALL(env, napi_get_cb_info(env, info, nullptr, nullptr, &thisVar, nullptr)); - URL* murl = nullptr; + URL *murl = nullptr; NAPI_CALL(env, napi_unwrap(env, thisVar, (void**)&murl)); napi_value retVal = murl->GetPort(); return retVal; @@ -408,7 +406,7 @@ namespace OHOS::Api { { napi_value thisVar = nullptr; NAPI_CALL(env, napi_get_cb_info(env, info, nullptr, nullptr, &thisVar, nullptr)); - URL* murl = nullptr; + URL *murl = nullptr; NAPI_CALL(env, napi_unwrap(env, thisVar, (void**)&murl)); napi_value retVal = murl->GetHost(); return retVal; @@ -418,7 +416,7 @@ namespace OHOS::Api { { napi_value thisVar = nullptr; NAPI_CALL(env, napi_get_cb_info(env, info, nullptr, nullptr, &thisVar, nullptr)); - URL* murl = nullptr; + URL *murl = nullptr; NAPI_CALL(env, napi_unwrap(env, thisVar, (void**)&murl)); napi_value retVal = murl->GetPath(); return retVal; @@ -428,7 +426,7 @@ namespace OHOS::Api { { napi_value thisVar = nullptr; NAPI_CALL(env, napi_get_cb_info(env, info, nullptr, nullptr, &thisVar, nullptr)); - URL* murl = nullptr; + URL *murl = nullptr; NAPI_CALL(env, napi_unwrap(env, thisVar, (void**)&murl)); napi_value retVal = murl->GetOnOrOff(); return retVal; @@ -438,7 +436,7 @@ namespace OHOS::Api { { napi_value thisVar = nullptr; NAPI_CALL(env, napi_get_cb_info(env, info, nullptr, nullptr, &thisVar, nullptr)); - URL* murl = nullptr; + URL *murl = nullptr; NAPI_CALL(env, napi_unwrap(env, thisVar, (void**)&murl)); napi_value retVal = murl->GetIsIpv6(); return retVal; @@ -451,7 +449,7 @@ namespace OHOS::Api { size_t argc = 1; std::string input = ""; NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, nullptr)); - char* type = nullptr; + char *type = nullptr; size_t typelen = 0; NAPI_CALL(env, napi_get_value_string_utf8(env, argv[0], nullptr, 0, &typelen)); if (typelen > 0) { @@ -463,7 +461,7 @@ namespace OHOS::Api { delete[] type; type = nullptr; } - URL* murl = nullptr; + URL *murl = nullptr; NAPI_CALL(env, napi_unwrap(env, thisVar, (void**)&murl)); murl->SetHref(input); napi_value result = nullptr; @@ -478,7 +476,7 @@ namespace OHOS::Api { size_t argc = 1; std::string input = ""; NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, nullptr)); - char* type = nullptr; + char *type = nullptr; size_t typelen = 0; NAPI_CALL(env, napi_get_value_string_utf8(env, argv[0], nullptr, 0, &typelen)); if (typelen > 0) { @@ -490,7 +488,7 @@ namespace OHOS::Api { delete[] type; type = nullptr; } - URL* murl = nullptr; + URL *murl = nullptr; NAPI_CALL(env, napi_unwrap(env, thisVar, (void**)&murl)); murl->SetHostname(input); napi_value result = nullptr; @@ -505,7 +503,7 @@ namespace OHOS::Api { size_t argc = 1; std::string input = ""; NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, nullptr)); - char* type = nullptr; + char *type = nullptr; size_t typelen = 0; NAPI_CALL(env, napi_get_value_string_utf8(env, argv[0], nullptr, 0, &typelen)); if (typelen > 0) { @@ -517,7 +515,7 @@ namespace OHOS::Api { delete[] type; type = nullptr; } - URL* murl = nullptr; + URL *murl = nullptr; NAPI_CALL(env, napi_unwrap(env, thisVar, (void**)&murl)); murl->SetPort(input); napi_value result = nullptr; @@ -532,7 +530,7 @@ namespace OHOS::Api { size_t argc = 1; std::string input = ""; NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, nullptr)); - char* type = nullptr; + char *type = nullptr; size_t typelen = 0; NAPI_CALL(env, napi_get_value_string_utf8(env, argv[0], nullptr, 0, &typelen)); if (typelen > 0) { @@ -544,7 +542,7 @@ namespace OHOS::Api { delete[] type; type = nullptr; } - URL* murl = nullptr; + URL *murl = nullptr; NAPI_CALL(env, napi_unwrap(env, thisVar, (void**)&murl)); murl->SetHost(input); napi_value result = nullptr; @@ -559,7 +557,7 @@ namespace OHOS::Api { size_t argc = 1; std::string input = ""; NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, nullptr)); - char* type = nullptr; + char *type = nullptr; size_t typelen = 0; NAPI_CALL(env, napi_get_value_string_utf8(env, argv[0], nullptr, 0, &typelen)); if (typelen > 0) { @@ -571,7 +569,7 @@ namespace OHOS::Api { delete[] type; type = nullptr; } - URL* murl = nullptr; + URL *murl = nullptr; NAPI_CALL(env, napi_unwrap(env, thisVar, (void**)&murl)); murl->SetSearch(input); napi_value result = nullptr; @@ -586,7 +584,7 @@ namespace OHOS::Api { size_t argc = 1; std::string input = ""; NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, nullptr)); - char* type = nullptr; + char *type = nullptr; size_t typelen = 0; NAPI_CALL(env, napi_get_value_string_utf8(env, argv[0], nullptr, 0, &typelen)); if (typelen > 0) { @@ -598,7 +596,7 @@ namespace OHOS::Api { delete[] type; type = nullptr; } - URL* murl = nullptr; + URL *murl = nullptr; NAPI_CALL(env, napi_unwrap(env, thisVar, (void**)&murl)); murl->SetScheme(input); napi_value result = nullptr; @@ -613,7 +611,7 @@ namespace OHOS::Api { size_t argc = 1; std::string input = ""; NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, nullptr)); - char* type = nullptr; + char *type = nullptr; size_t typelen = 0; NAPI_CALL(env, napi_get_value_string_utf8(env, argv[0], nullptr, 0, &typelen)); if (typelen > 0) { @@ -625,7 +623,7 @@ namespace OHOS::Api { delete[] type; type = nullptr; } - URL* murl = nullptr; + URL *murl = nullptr; NAPI_CALL(env, napi_unwrap(env, thisVar, (void**)&murl)); murl->SetFragment(input); napi_value result = nullptr; @@ -640,7 +638,7 @@ namespace OHOS::Api { size_t argc = 1; std::string input = ""; NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, nullptr)); - char* type = nullptr; + char *type = nullptr; size_t typelen = 0; NAPI_CALL(env, napi_get_value_string_utf8(env, argv[0], nullptr, 0, &typelen)); if (typelen > 0) { @@ -652,7 +650,7 @@ namespace OHOS::Api { delete[] type; type = nullptr; } - URL* murl = nullptr; + URL *murl = nullptr; NAPI_CALL(env, napi_unwrap(env, thisVar, (void**)&murl)); murl->SetUsername(input); napi_value result = nullptr; @@ -667,7 +665,7 @@ namespace OHOS::Api { size_t argc = 1; std::string input = ""; NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, nullptr)); - char* type = nullptr; + char *type = nullptr; size_t typelen = 0; NAPI_CALL(env, napi_get_value_string_utf8(env, argv[0], nullptr, 0, &typelen)); if (typelen > 0) { @@ -679,7 +677,7 @@ namespace OHOS::Api { delete[] type; type = nullptr; } - URL* murl = nullptr; + URL *murl = nullptr; NAPI_CALL(env, napi_unwrap(env, thisVar, (void**)&murl)); murl->SetPath(input); napi_value result = nullptr; @@ -694,7 +692,7 @@ namespace OHOS::Api { size_t argc = 1; std::string input = ""; NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, nullptr)); - char* type = nullptr; + char *type = nullptr; size_t typelen = 0; NAPI_CALL(env, napi_get_value_string_utf8(env, argv[0], nullptr, 0, &typelen)); if (typelen > 0) { @@ -706,7 +704,7 @@ namespace OHOS::Api { delete[] type; type = nullptr; } - URL* murl = nullptr; + URL *murl = nullptr; NAPI_CALL(env, napi_unwrap(env, thisVar, (void**)&murl)); murl->SetPassword(input); napi_value result = nullptr; @@ -717,15 +715,15 @@ namespace OHOS::Api { static napi_value SeachParamsConstructor(napi_env env, napi_callback_info info) { napi_value thisVar = nullptr; - void* data = nullptr; + void *data = nullptr; NAPI_CALL(env, napi_get_cb_info(env, info, nullptr, nullptr, &thisVar, &data)); auto object = new URLSearchParams(env); napi_wrap( env, thisVar, object, - [](napi_env env, void* data, void* hint) { - auto object = (URLSearchParams*)data; - if (object != nullptr) { - delete object; + [](napi_env env, void *data, void *hint) { + auto obj = (URLSearchParams*)data; + if (obj != nullptr) { + delete obj; } }, nullptr, nullptr); @@ -744,7 +742,7 @@ namespace OHOS::Api { size_t arraySize = 0; napi_value napiStr = nullptr; for (size_t i = 0; i < length; i++) { - char* cstr = nullptr; + char *cstr = nullptr; napi_get_element(env, argv[0], i, &napiStr); napi_get_value_string_utf8(env, napiStr, nullptr, 0, &arraySize); if (arraySize > 0) { @@ -757,7 +755,7 @@ namespace OHOS::Api { vec.push_back(""); } } - URLSearchParams* murl = nullptr; + URLSearchParams *murl = nullptr; NAPI_CALL(env, napi_unwrap(env, thisVar, (void**)&murl)); murl->SetArray(vec); napi_value result = nullptr; @@ -769,7 +767,7 @@ namespace OHOS::Api { { napi_value thisVar = nullptr; NAPI_CALL(env, napi_get_cb_info(env, info, nullptr, nullptr, &thisVar, nullptr)); - URLSearchParams* murl = nullptr; + URLSearchParams *murl = nullptr; NAPI_CALL(env, napi_unwrap(env, thisVar, (void**)&murl)); napi_value retVal = murl->GetArray(); return retVal; @@ -785,7 +783,7 @@ namespace OHOS::Api { HILOG_INFO("One arg needs to be specified"); return nullptr; } - URLSearchParams* object = nullptr; + URLSearchParams *object = nullptr; napi_unwrap(env, thisVar, (void**)&object); napi_value result = object->Get(args); return result; @@ -801,7 +799,7 @@ namespace OHOS::Api { HILOG_INFO("One arg needs to be specified"); return nullptr; } - URLSearchParams* object = nullptr; + URLSearchParams *object = nullptr; napi_unwrap(env, thisVar, (void**)&object); napi_value result = object->GetAll(args); return result; @@ -812,13 +810,13 @@ namespace OHOS::Api { napi_value thisVar = nullptr; size_t argc = 2; napi_value args[2] = { 0 }; - void* data = nullptr; + void *data = nullptr; napi_get_cb_info(env, info, &argc, args, &thisVar, &data); if (argc != 2) { // 2:If the input parameter is not set to 2, HILOG_INFO("Two args needs to be specified"); return nullptr; } - URLSearchParams* object = nullptr; + URLSearchParams *object = nullptr; napi_unwrap(env, thisVar, (void**)&object); object->Append(args[0], args[1]); return nullptr; @@ -834,7 +832,7 @@ namespace OHOS::Api { HILOG_INFO("One arg needs to be specified"); return nullptr; } - URLSearchParams* object = nullptr; + URLSearchParams *object = nullptr; napi_unwrap(env, thisVar, (void**)&object); object->Delete(args); return nullptr; @@ -846,7 +844,7 @@ namespace OHOS::Api { size_t argc = 1; napi_value args = nullptr; napi_get_cb_info(env, info, &argc, &args, &thisVar, nullptr); - URLSearchParams* object = nullptr; + URLSearchParams *object = nullptr; napi_unwrap(env, thisVar, (void**)&object); object->ForEach(args, thisVar); return nullptr; @@ -858,7 +856,7 @@ namespace OHOS::Api { size_t argc = 0; napi_value args = nullptr; napi_get_cb_info(env, info, &argc, &args, &thisVar, nullptr); - URLSearchParams* object = nullptr; + URLSearchParams *object = nullptr; napi_unwrap(env, thisVar, (void**)&object); napi_value result = object->Entries(); return result; @@ -870,7 +868,7 @@ namespace OHOS::Api { size_t argc = 1; napi_value args = nullptr; NAPI_CALL(env, napi_get_cb_info(env, info, &argc, &args, &thisVar, nullptr)); - URLSearchParams* object = nullptr; + URLSearchParams *object = nullptr; NAPI_CALL(env, napi_unwrap(env, thisVar, (void**)&object)); napi_value result = object->IsHas(args); return result; @@ -882,7 +880,7 @@ namespace OHOS::Api { size_t argc = 2; napi_value args[2] = { 0 }; napi_get_cb_info(env, info, &argc, args, &thisVar, nullptr); - URLSearchParams* object = nullptr; + URLSearchParams *object = nullptr; napi_unwrap(env, thisVar, (void**)&object); object->Set(args[0], args[1]); return nullptr; @@ -894,7 +892,7 @@ namespace OHOS::Api { size_t argc = 0; napi_value args = nullptr; napi_get_cb_info(env, info, &argc, &args, &thisVar, nullptr); - URLSearchParams* object = nullptr; + URLSearchParams *object = nullptr; napi_unwrap(env, thisVar, (void**)&object); object->Sort(); return nullptr; @@ -906,7 +904,7 @@ namespace OHOS::Api { size_t argc = 0; napi_value args = nullptr; napi_get_cb_info(env, info, &argc, &args, &thisVar, nullptr); - URLSearchParams* object = nullptr; + URLSearchParams *object = nullptr; napi_unwrap(env, thisVar, (void**)&object); napi_value result = object->ToString(); return result; @@ -918,7 +916,7 @@ namespace OHOS::Api { size_t argc = 0; napi_value args = nullptr; napi_get_cb_info(env, info, &argc, &args, &thisVar, nullptr); - URLSearchParams* object = nullptr; + URLSearchParams *object = nullptr; napi_unwrap(env, thisVar, (void**)&object); napi_value result = object->IterByKeys(); return result; @@ -930,7 +928,7 @@ namespace OHOS::Api { size_t argc = 0; napi_value args = nullptr; napi_get_cb_info(env, info, &argc, &args, &thisVar, nullptr); - URLSearchParams* object = nullptr; + URLSearchParams *object = nullptr; napi_unwrap(env, thisVar, (void**)&object); napi_value result = object->IterByValues(); return result; @@ -1038,7 +1036,7 @@ namespace OHOS::Api { size_t argc = 1; std::string input = ""; napi_get_cb_info(env, info, &argc, argv, &thisVar, nullptr); - char* type = nullptr; + char *type = nullptr; size_t typelen = 0; napi_get_value_string_utf8(env, argv[0], nullptr, 0, &typelen); if (typelen > 0) { @@ -1078,8 +1076,9 @@ namespace OHOS::Api { DECLARE_NAPI_FUNCTION("entries", Entries), DECLARE_NAPI_GETTER_SETTER("array", GetArray, SetArray), }; - NAPI_CALL(env, napi_define_class(env, seachParamsClassName, strlen(seachParamsClassName), SeachParamsConstructor, - nullptr, sizeof(UrlDesc) / sizeof(UrlDesc[0]), UrlDesc, &seachParamsInitClass)); + NAPI_CALL(env, napi_define_class(env, seachParamsClassName, strlen(seachParamsClassName), + SeachParamsConstructor, nullptr, sizeof(UrlDesc) / sizeof(UrlDesc[0]), + UrlDesc, &seachParamsInitClass)); static napi_property_descriptor desc[] = { DECLARE_NAPI_PROPERTY("URLSearchParams1", seachParamsInitClass) }; @@ -1106,8 +1105,7 @@ namespace OHOS::Api { DECLARE_NAPI_GETTER("GetIsIpv6", GetIsIpv6), }; NAPI_CALL(env, napi_define_class(env, urlClassName, strlen(urlClassName), UrlConstructor, - nullptr, sizeof(UrlDesc) / sizeof(UrlDesc[0]), UrlDesc, - &urlClass)); + nullptr, sizeof(UrlDesc) / sizeof(UrlDesc[0]), UrlDesc, &urlClass)); static napi_property_descriptor desc[] = { DECLARE_NAPI_PROPERTY("Url", urlClass) }; @@ -1136,8 +1134,7 @@ namespace OHOS::Api { DECLARE_NAPI_GETTER("isFailed", IsFailed), }; NAPI_CALL(env, napi_define_class(env, uriClassName, strlen(uriClassName), UriConstructor, - nullptr, sizeof(uriDesc) / sizeof(uriDesc[0]), uriDesc, - &uriClass)); + nullptr, sizeof(uriDesc) / sizeof(uriDesc[0]), uriDesc, &uriClass)); g_uriClass = uriClass; static napi_property_descriptor desc[] = { DECLARE_NAPI_PROPERTY("Uri", uriClass)