!31 modify codecheck

Merge pull request !31 from clearme777/master
This commit is contained in:
openharmony_ci
2021-09-23 11:12:04 +00:00
committed by Gitee
3 changed files with 44 additions and 41 deletions
+32 -29
View File
@@ -49,7 +49,7 @@ namespace OHOS::Util {
napi_typedarray_type type;
size_t byteOffset = 0;
size_t length = 0;
void* resultData = nullptr;
void *resultData = nullptr;
napi_value resultBuffer = nullptr;
NAPI_CALL(env, napi_get_typedarray_info(env, src, &type, &length, &resultData, &resultBuffer, &byteOffset));
inputEncode = static_cast<const unsigned char*>(resultData) + byteOffset;
@@ -57,8 +57,8 @@ namespace OHOS::Util {
NAPI_CALL(env, napi_get_value_int32(env, flags, &iflag));
size_t flag = 0;
flag = static_cast<size_t>(iflag);
const unsigned char* rets = EncodeAchieve(inputEncode, length, flag);
void* data = nullptr;
const unsigned char *rets = EncodeAchieve(inputEncode, length, flag);
void *data = nullptr;
napi_value arrayBuffer = nullptr;
size_t bufferSize = outputLen;
NAPI_CALL(env, napi_create_arraybuffer(env, bufferSize, &data, &arrayBuffer));
@@ -79,7 +79,7 @@ namespace OHOS::Util {
napi_typedarray_type type;
size_t byteOffset = 0;
size_t length = 0;
void* resultData = nullptr;
void *resultData = nullptr;
napi_value resultBuffer = nullptr;
NAPI_CALL(env, napi_get_typedarray_info(env, src, &type, &length, &resultData, &resultBuffer, &byteOffset));
inputEncode = static_cast<const unsigned char*>(resultData) + byteOffset;
@@ -87,8 +87,8 @@ namespace OHOS::Util {
NAPI_CALL(env, napi_get_value_int32(env, flags, &iflag));
size_t flag = 0;
flag = static_cast<size_t>(iflag);
unsigned char* ret = EncodeAchieve(inputEncode, length, flag);
char* rstring = nullptr;
unsigned char *ret = EncodeAchieve(inputEncode, length, flag);
char *rstring = nullptr;
if (outputLen > 0) {
rstring = new char[outputLen + 1];
if (memset_s(rstring, outputLen + 1, '\0', outputLen + 1) != 0) {
@@ -103,8 +103,8 @@ namespace OHOS::Util {
rstring[i] = char(ret[i]);
}
std::string finalString = rstring;
const char* outString = finalString.c_str();
const char* encString = static_cast<const char*>(outString);
const char *outString = finalString.c_str();
const char *encString = static_cast<const char*>(outString);
napi_value resultStr = nullptr;
NAPI_CALL(env, napi_create_string_utf8(env, encString, strlen(encString), &resultStr));
FreeMemory(ret);
@@ -112,13 +112,13 @@ namespace OHOS::Util {
return resultStr;
}
unsigned char* Base64::EncodeAchieve(const unsigned char* input, size_t inputLen, size_t iflag)
unsigned char *Base64::EncodeAchieve(const unsigned char *input, size_t inputLen, size_t iflag)
{
size_t inp = 0;
size_t temp = 0;
size_t bitWise = 0;
unsigned char* ret = nullptr;
unsigned char* bosom = nullptr;
unsigned char *ret = nullptr;
unsigned char *bosom = nullptr;
outputLen = (inputLen / TRAGET_THREE) * TRAGET_FOUR;
if ((inputLen % TRAGET_THREE) > 0) {
outputLen += TRAGET_FOUR;
@@ -170,9 +170,9 @@ namespace OHOS::Util {
napi_typedarray_type type;
size_t byteOffset = 0;
size_t length = 0;
void* resultData = nullptr;
void *resultData = nullptr;
napi_value resultBuffer = nullptr;
char* inputString = nullptr;
char *inputString = nullptr;
if (valuetype != napi_valuetype::napi_string) {
NAPI_CALL(env, napi_get_typedarray_info(env, src, &type, &length, &resultData, &resultBuffer, &byteOffset));
}
@@ -198,7 +198,7 @@ namespace OHOS::Util {
inputDecode = static_cast<const char*>(resultData) + byteOffset;
pret = DecodeAchieve(inputDecode, length, flag);
}
void* data = nullptr;
void *data = nullptr;
napi_value arrayBuffer = nullptr;
size_t bufferSize = decodeOutLen;
NAPI_CALL(env, napi_create_arraybuffer(env, bufferSize, &data, &arrayBuffer));
@@ -215,12 +215,12 @@ namespace OHOS::Util {
return result;
}
unsigned char* Base64::DecodeAchieve(const char* input, size_t inputLen, size_t iflag)
unsigned char *Base64::DecodeAchieve(const char *input, size_t inputLen, size_t iflag)
{
retLen = (inputLen / TRAGET_FOUR) * TRAGET_THREE;
decodeOutLen = retLen;
size_t equalCount = 0;
unsigned char* bosom = nullptr;
unsigned char *bosom = nullptr;
size_t inp = 0;
size_t temp = 0;
size_t bitWise = 0;
@@ -270,6 +270,7 @@ namespace OHOS::Util {
size_t Base64::DecodeOut(size_t equalCount, size_t retLen)
{
size_t temp = retLen;
if (equalCount == 1) {
decodeOutLen -= 1;
}
@@ -278,19 +279,19 @@ namespace OHOS::Util {
}
switch (equalCount) {
case 0:
retLen += TRAGET_FOUR;
temp += TRAGET_FOUR;
break;
case 1:
retLen += TRAGET_FOUR;
temp += TRAGET_FOUR;
break;
case TRAGET_TWO:
retLen += TRAGET_THREE;
temp += TRAGET_THREE;
break;
default:
retLen += TRAGET_TWO;
temp += TRAGET_TWO;
break;
}
return retLen;
return temp;
}
/* Decoding lookup function */
@@ -316,18 +317,20 @@ namespace OHOS::Util {
}
/* Memory cleanup function */
void Base64::FreeMemory(const unsigned char* address)
void Base64::FreeMemory(const unsigned char *address)
{
if (address != nullptr) {
delete[] address;
address = nullptr;
const unsigned char *temp = address;
if (temp != nullptr) {
delete[] temp;
temp = nullptr;
}
}
void Base64::FreeMemory(const char* address)
void Base64::FreeMemory(const char *address)
{
if (address != nullptr) {
delete[] address;
address = nullptr;
const char *temp = address;
if (temp != nullptr) {
delete[] temp;
temp = nullptr;
}
}
}
+9 -9
View File
@@ -12,7 +12,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#include <cstring>
#include <sys/sysinfo.h>
#include <unistd.h>
@@ -38,19 +38,19 @@ namespace OHOS::Util {
napi_value Decode(napi_value src, napi_value flags);
private:
napi_env env;
unsigned char* DecodeAchieve(const char* input, size_t inputLen, size_t iflag);
unsigned char* EncodeAchieve(const unsigned char* input, size_t inputLen, size_t iflag);
unsigned char *DecodeAchieve(const char *input, size_t inputLen, size_t iflag);
unsigned char *EncodeAchieve(const unsigned char *input, size_t inputLen, size_t iflag);
size_t Finds(char ch, size_t iflag);
size_t DecodeOut(size_t equalCount, size_t retLen);
void FreeMemory(const unsigned char* address);
void FreeMemory(const char* address);
void FreeMemory(const unsigned char *address);
void FreeMemory(const char *address);
size_t retLen = 0;
size_t decodeOutLen = 0;
size_t outputLen = 0;
unsigned char* pret = nullptr;
const unsigned char* inputEncode = nullptr;
const char* inputDecode = nullptr;
unsigned char* retDecode = nullptr;
unsigned char *pret = nullptr;
const unsigned char *inputEncode = nullptr;
const char *inputDecode = nullptr;
unsigned char *retDecode = nullptr;
};
}
#endif
+3 -3
View File
@@ -59,7 +59,7 @@ namespace OHOS::Util {
size_t len = 0;
int flag = 0;
napi_get_value_string_utf8(env_, str, nullptr, 0, &len);
char* buffer = nullptr;
char *buffer = nullptr;
if (len > 0) {
buffer = new char[len + 1];
if (memset_s(buffer, len + 1, '\0', len + 1) != 0) {
@@ -121,7 +121,7 @@ namespace OHOS::Util {
napi_value RationalNumber::CompareTo(napi_value rational) const
{
RationalNumber* other = nullptr;
RationalNumber *other = nullptr;
NAPI_CALL(env_, napi_unwrap(env_, rational, reinterpret_cast<void**>(&other)));
if (mnum == other->mnum && mden == other->mden) {
napi_value result = nullptr;
@@ -163,7 +163,7 @@ namespace OHOS::Util {
napi_value RationalNumber::Equals(napi_value obj) const
{
RationalNumber* object = nullptr;
RationalNumber *object = nullptr;
napi_status status = napi_unwrap(env_, obj, reinterpret_cast<void**>(&object));
bool flag = false;
long thisnum = static_cast<long>(mnum) * object->mden;