From 8ce3f00a0d1871ee91c99c60d9ad310688d3c886 Mon Sep 17 00:00:00 2001 From: pollyzhang Date: Mon, 27 Feb 2023 21:48:05 +0800 Subject: [PATCH] fix(base): fix capitalization error --- android/sdk/src/main/jni/src/jni/uri.cc | 2 +- core/include/core/base/string_view_utils.h | 2 +- core/src/napi/jsc/js_native_api_value_jsc.cc | 2 +- core/src/napi/v8/js_native_api_v8.cc | 2 +- core/third_party/base/include/base/unicode_string_view.h | 4 ++-- core/third_party/base/src/base/unicode_string_view.cc | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/android/sdk/src/main/jni/src/jni/uri.cc b/android/sdk/src/main/jni/src/jni/uri.cc index 16fdd9aba..2519963e3 100644 --- a/android/sdk/src/main/jni/src/jni/uri.cc +++ b/android/sdk/src/main/jni/src/jni/uri.cc @@ -76,7 +76,7 @@ bool Uri::Destroy() { } Uri::Uri(const unicode_string_view& uri) { - TDF_BASE_DCHECK(uri.encoding() != unicode_string_view::Encoding::UnKnown); + TDF_BASE_DCHECK(uri.encoding() != unicode_string_view::Encoding::Unknown); JNIEnv* j_env = JNIEnvironment::GetInstance()->AttachCurrentThread(); jstring j_str_uri = JniUtils::StrViewToJString(j_env, uri); j_obj_uri_ = diff --git a/core/include/core/base/string_view_utils.h b/core/include/core/base/string_view_utils.h index 6344c3397..9bad4e93f 100644 --- a/core/include/core/base/string_view_utils.h +++ b/core/include/core/base/string_view_utils.h @@ -48,7 +48,7 @@ class StringViewUtils { inline static bool IsEmpty(const unicode_string_view &str_view) { unicode_string_view::Encoding encoding = str_view.encoding(); switch (encoding) { - case unicode_string_view::Encoding::UnKnown: { + case unicode_string_view::Encoding::Unknown: { return true; } case unicode_string_view::Encoding::Latin1: { diff --git a/core/src/napi/jsc/js_native_api_value_jsc.cc b/core/src/napi/jsc/js_native_api_value_jsc.cc index 0a7edfbc2..b24c685dc 100644 --- a/core/src/napi/jsc/js_native_api_value_jsc.cc +++ b/core/src/napi/jsc/js_native_api_value_jsc.cc @@ -499,7 +499,7 @@ JSStringRef JSCCtx::CreateJSCString(const unicode_string_view& str_view) { unicode_string_view::Encoding encoding = str_view.encoding(); JSStringRef ret; switch (encoding) { - case unicode_string_view::Encoding::UnKnown: { + case unicode_string_view::Encoding::Unknown: { TDF_BASE_UNREACHABLE(); break; } diff --git a/core/src/napi/v8/js_native_api_v8.cc b/core/src/napi/v8/js_native_api_v8.cc index cc9d05a57..0b4f90a8c 100644 --- a/core/src/napi/v8/js_native_api_v8.cc +++ b/core/src/napi/v8/js_native_api_v8.cc @@ -981,7 +981,7 @@ std::shared_ptr V8Ctx::CreateBoolean(bool b) { std::shared_ptr V8Ctx::CreateString( const unicode_string_view& str_view) { - if (str_view.encoding() == unicode_string_view::Encoding::UnKnown) { + if (str_view.encoding() == unicode_string_view::Encoding::Unknown) { return nullptr; } v8::HandleScope isolate_scope(isolate_); diff --git a/core/third_party/base/include/base/unicode_string_view.h b/core/third_party/base/include/base/unicode_string_view.h index 6d6bd06cb..ddd6a06fe 100644 --- a/core/third_party/base/include/base/unicode_string_view.h +++ b/core/third_party/base/include/base/unicode_string_view.h @@ -38,7 +38,7 @@ namespace base { class unicode_string_view final { public: - enum class Encoding { UnKnown, Latin1, Utf8, Utf16, Utf32 }; + enum class Encoding { Unknown, Latin1, Utf8, Utf16, Utf32 }; using string = std::string; #ifdef __cpp_char8_t using u8string = std::u8string; @@ -144,7 +144,7 @@ class unicode_string_view final { inline void deallocate(); private: - Encoding encoding_ = Encoding::UnKnown; + Encoding encoding_ = Encoding::Unknown; union { string latin1_string_; u8string u8_string_; diff --git a/core/third_party/base/src/base/unicode_string_view.cc b/core/third_party/base/src/base/unicode_string_view.cc index 0925b5a68..c3d173737 100644 --- a/core/third_party/base/src/base/unicode_string_view.cc +++ b/core/third_party/base/src/base/unicode_string_view.cc @@ -85,7 +85,7 @@ inline void unicode_string_view::deallocate() { default: break; } - encoding_ = Encoding::UnKnown; + encoding_ = Encoding::Unknown; } unicode_string_view& unicode_string_view::operator=(const unicode_string_view& rhs) noexcept {