diff --git a/interfaces/ets/ani/hilog/ets/@ohos.hilog.ets b/interfaces/ets/ani/hilog/ets/@ohos.hilog.ets index 7d911e424c7ba3df830e81cf540770fd016b8b83..94f32eca6baac937433aa1a2271adf9fef2bcc15 100644 --- a/interfaces/ets/ani/hilog/ets/@ohos.hilog.ets +++ b/interfaces/ets/ani/hilog/ets/@ohos.hilog.ets @@ -13,7 +13,7 @@ * limitations under the License. */ -type RecordData = undefined | null | Object | Record | Array; +import { RecordData } from '@ohos.base'; export default namespace hilog { loadLibrary("hilog_ani"); diff --git a/interfaces/ets/ani/hilog/include/hilog_ani_base.h b/interfaces/ets/ani/hilog/include/hilog_ani_base.h index 2d02f143e87c012dcdcbfc5fa0c554a3b32ef046..1de9be34617b88d73d610912edaeb8fb62195399 100644 --- a/interfaces/ets/ani/hilog/include/hilog_ani_base.h +++ b/interfaces/ets/ani/hilog/include/hilog_ani_base.h @@ -26,10 +26,10 @@ using AniParam = struct { std::string val; }; -typedef struct LogContentPosition { +struct LogContentPosition { uint32_t pos = 0; uint32_t count = 0; -} LogContentPosition; +}; class HilogAniBase { public: diff --git a/interfaces/ets/ani/hilog/src/ani_util.cpp b/interfaces/ets/ani/hilog/src/ani_util.cpp index 138833635dd2d09bb77887a0e55aa1593705c77a..c16401cf2ac31a62abd773f591b494952d650096 100644 --- a/interfaces/ets/ani/hilog/src/ani_util.cpp +++ b/interfaces/ets/ani/hilog/src/ani_util.cpp @@ -54,9 +54,9 @@ bool AniUtil::IsRefUndefined(ani_env *env, ani_ref ref) bool AniUtil::IsRefNull(ani_env *env, ani_ref ref) { - ani_boolean isUull = ANI_FALSE; - env->Reference_IsNull(ref, &isUull); - return isUull; + ani_boolean isNull = ANI_FALSE; + env->Reference_IsNull(ref, &isNull); + return isNull; } AniArgsType AniUtil::AniArgGetType(ani_env *env, ani_object element) @@ -104,7 +104,6 @@ std::string AniUtil::AniStringToStdString(ani_env *env, ani_string aniStr) char* utf8Buffer = buffer.data(); ani_size bytesWritten = 0; env->String_GetUTF8(aniStr, utf8Buffer, strSize + 1, &bytesWritten); - utf8Buffer[bytesWritten] = '\0'; return std::string(utf8Buffer); } diff --git a/interfaces/js/kits/napi/src/hilog/include/context/hilog_napi_base.h b/interfaces/js/kits/napi/src/hilog/include/context/hilog_napi_base.h index 371e4ac10b4b5270c809716aaa2174017bc78baf..692b2a8c1edccce3e95cda4a213d4acc48407d14 100644 --- a/interfaces/js/kits/napi/src/hilog/include/context/hilog_napi_base.h +++ b/interfaces/js/kits/napi/src/hilog/include/context/hilog_napi_base.h @@ -45,7 +45,7 @@ public: static napi_value SetMinLogLevel(napi_env env, napi_callback_info info); static napi_value SetLogLevel(napi_env env, napi_callback_info info); private: - static napi_value parseNapiValue(napi_env env, napi_callback_info info, + static napi_value ParseNapiValue(napi_env env, napi_callback_info info, napi_value element, std::vector& params); }; } // namespace HiviewDFX diff --git a/interfaces/js/kits/napi/src/hilog/src/hilog_napi_base.cpp b/interfaces/js/kits/napi/src/hilog/src/hilog_napi_base.cpp index 92ae9586e85de61e8438bdb60e06b238403c0ed5..a31e2ecb0cfeb0cc9e4e2f730aa0ae0be48fd1ba 100644 --- a/interfaces/js/kits/napi/src/hilog/src/hilog_napi_base.cpp +++ b/interfaces/js/kits/napi/src/hilog/src/hilog_napi_base.cpp @@ -232,7 +232,7 @@ napi_value HilogNapiBase::SysLogFatal(napi_env env, napi_callback_info info) return HilogImpl(env, info, LOG_FATAL, false); } -napi_value HilogNapiBase::parseNapiValue(napi_env env, napi_callback_info info, +napi_value HilogNapiBase::ParseNapiValue(napi_env env, napi_callback_info info, napi_value element, vector& params) { bool succ = false; @@ -304,7 +304,7 @@ napi_value HilogNapiBase::HilogImpl(napi_env env, napi_callback_info info, int l if (!res) { for (size_t i = MIN_NUMBER; i < funcArg.GetArgc(); i++) { napi_value argsVal = funcArg[i]; - (void)parseNapiValue(env, info, argsVal, params); + (void)ParseNapiValue(env, info, argsVal, params); } } else { if (funcArg.GetArgc() != MIN_NUMBER + 1) { @@ -324,7 +324,7 @@ napi_value HilogNapiBase::HilogImpl(napi_env env, napi_callback_info info, int l if (eleStatus != napi_ok) { return nullptr; } - (void)parseNapiValue(env, info, element, params); + (void)ParseNapiValue(env, info, element, params); } } ParseLogContent(fmtString, params, logContent);