diff --git a/tools/hdi-gen/ast/ast_parameter.cpp b/tools/hdi-gen/ast/ast_parameter.cpp index de7c0022748b246d32cf4481e4d618a3a83e369c..462b757e165d05b933be7e91524805293acff5c0 100755 --- a/tools/hdi-gen/ast/ast_parameter.cpp +++ b/tools/hdi-gen/ast/ast_parameter.cpp @@ -215,6 +215,5 @@ void ASTParameter::EmitCWriteVar(const String& parcelName, const String& gotoLab type_->EmitCWriteVar(parcelName, name_, gotoLabel, sb, prefix); } - } // namespace HDI } // namespace OHOS \ No newline at end of file diff --git a/tools/hdi-gen/ast/ast_parameter.h b/tools/hdi-gen/ast/ast_parameter.h index 033f068864fca11217078b1bf25d891abec2998c..6ecc352878a0694b0d6fc624feae489780365eab 100755 --- a/tools/hdi-gen/ast/ast_parameter.h +++ b/tools/hdi-gen/ast/ast_parameter.h @@ -68,7 +68,8 @@ public: String EmitJavaLocalVar(); - void EmitCWriteVar(const String& parcelName, const String& gotoLabel, StringBuilder& sb, const String& prefix) const; + void EmitCWriteVar(const String& parcelName, const String& gotoLabel, StringBuilder& sb, + const String& prefix) const; private: String name_; AutoPtr type_ = nullptr; diff --git a/tools/hdi-gen/codegen/c_service_impl_code_emitter.cpp b/tools/hdi-gen/codegen/c_service_impl_code_emitter.cpp index d7f9a8b8930c0f8a5ed9e6cc436f47dfee9a4dc2..b5c899dbbc691386dcf6ddf0865a617bd21d2dda 100755 --- a/tools/hdi-gen/codegen/c_service_impl_code_emitter.cpp +++ b/tools/hdi-gen/codegen/c_service_impl_code_emitter.cpp @@ -171,7 +171,8 @@ void CServiceImplCodeEmitter::EmitServiceImplInstance(StringBuilder& sb) sb.Append(g_tab).AppendFormat("struct %s *%s = (struct %s*)OsalMemAlloc(sizeof(struct %s));\n", interfaceName_.string(), objName.string(), interfaceName_.string(), interfaceName_.string()); sb.Append(g_tab).AppendFormat("if (%s == NULL) {\n", objName.string()); - sb.Append(g_tab).Append(g_tab).AppendFormat("HDF_LOGE(\"%%{public}s: OsalMemAlloc struct %s %s failed!\", __func__);\n", + sb.Append(g_tab).Append(g_tab).AppendFormat( + "HDF_LOGE(\"%%{public}s: OsalMemAlloc struct %s %s failed!\", __func__);\n", interfaceName_.string(), objName.string()); sb.Append(g_tab).Append(g_tab).Append("return NULL;\n"); sb.Append(g_tab).Append("}\n"); diff --git a/tools/hdi-gen/codegen/cpp_client_proxy_code_emitter.cpp b/tools/hdi-gen/codegen/cpp_client_proxy_code_emitter.cpp index fded485b25e565776a25abbaa5498eb00434a561..aa09a8704ff6948b272ff003dbdbe2d1369ffde9 100755 --- a/tools/hdi-gen/codegen/cpp_client_proxy_code_emitter.cpp +++ b/tools/hdi-gen/codegen/cpp_client_proxy_code_emitter.cpp @@ -208,7 +208,8 @@ void CppClientProxyCodeEmitter::EmitGetMethodImpl(StringBuilder& sb, const Strin sb.Append(prefix + g_tab + g_tab).Append("using namespace OHOS::HDI::ServiceManager::V1_0;\n"); sb.Append(prefix + g_tab + g_tab).Append("auto servMgr = IServiceManager::Get();\n"); sb.Append(prefix + g_tab + g_tab).Append("if (servMgr == nullptr) {\n"); - sb.Append(prefix + g_tab + g_tab + g_tab).Append("HDF_LOGE(\"%{public}s:get IServiceManager failed!\", __func__);\n"); + sb.Append(prefix + g_tab + g_tab + g_tab).Append( + "HDF_LOGE(\"%{public}s:get IServiceManager failed!\", __func__);\n"); sb.Append(prefix + g_tab + g_tab + g_tab).Append("break;\n"); sb.Append(prefix + g_tab + g_tab).Append("}\n\n"); sb.Append(prefix + g_tab + g_tab).AppendFormat("sptr remote = servMgr->GetService(\"%sService\");\n", diff --git a/tools/hdi-gen/codegen/cpp_service_stub_code_emitter.cpp b/tools/hdi-gen/codegen/cpp_service_stub_code_emitter.cpp index 32ca847a0b5bf6ad637edfb4c268e811f5eaa603..bffb79c89e9c977154e7a929a24123b836418b54 100755 --- a/tools/hdi-gen/codegen/cpp_service_stub_code_emitter.cpp +++ b/tools/hdi-gen/codegen/cpp_service_stub_code_emitter.cpp @@ -375,7 +375,8 @@ void CppServiceStubCodeEmitter::EmitCbStubOnRequestMethodImpl(StringBuilder& sb, sb.Append(prefix + g_tab + g_tab).Append("default: {\n"); sb.Append(prefix + g_tab + g_tab + g_tab).Append( "HDF_LOGE(\"%{public}s: not support cmd %{public}d\", __func__, code);\n"); - sb.Append(prefix + g_tab + g_tab + g_tab).Append("return IPCObjectStub::OnRemoteRequest(code, data, reply, option);\n"); + sb.Append(prefix + g_tab + g_tab + g_tab).Append( + "return IPCObjectStub::OnRemoteRequest(code, data, reply, option);\n"); sb.Append(prefix + g_tab + g_tab).Append("}\n"); sb.Append(prefix + g_tab).Append("}\n"); sb.Append("}\n"); diff --git a/tools/hdi-gen/test/cpp_test/map_test/v1_0/cpp_map_test.cpp b/tools/hdi-gen/test/cpp_test/map_test/v1_0/cpp_map_test.cpp index d7241049eb8eed634ca4e51b34952af3e0e01e67..6a25df095e1b3612ddf0c40a12f09557e683afe2 100755 --- a/tools/hdi-gen/test/cpp_test/map_test/v1_0/cpp_map_test.cpp +++ b/tools/hdi-gen/test/cpp_test/map_test/v1_0/cpp_map_test.cpp @@ -191,7 +191,7 @@ HWTEST_F(CppMapTest, CppMapTest_008, TestSize.Level1) std::map outParam; int32_t ec = g_testClient->MapIntStringTest(inParam, outParam); - ASSERT_EQ(ec, HDF_SUCCESS); + ASSERT_EQ(ec, HDF_SUCCESS); for (auto inIter = inParam.begin(); inIter != inParam.end(); ++inIter) { auto outIter = outParam.find(inIter->first); @@ -212,7 +212,7 @@ HWTEST_F(CppMapTest, CppMapTest_009, TestSize.Level1) std::map outParam; int32_t ec = g_testClient->MapIntFdTest(inParam, outParam); - ASSERT_EQ(ec, HDF_SUCCESS); + ASSERT_EQ(ec, HDF_SUCCESS); for (auto inIter = inParam.begin(); inIter != inParam.end(); ++inIter) { auto outIter = outParam.find(inIter->first); @@ -238,7 +238,7 @@ HWTEST_F(CppMapTest, CppMapTest_010, TestSize.Level1) std::map> outParam; int32_t ec = g_testClient->MapIntSeqTest(inParam, outParam); - ASSERT_EQ(ec, HDF_SUCCESS); + ASSERT_EQ(ec, HDF_SUCCESS); for (auto inIter = inParam.begin(); inIter != inParam.end(); ++inIter) { auto outIter = outParam.find(inIter->first); @@ -261,7 +261,7 @@ HWTEST_F(CppMapTest, CppMapTest_011, TestSize.Level1) std::map outParam; int32_t ec = g_testClient->MapIntEnumTest(inParam, outParam); - ASSERT_EQ(ec, HDF_SUCCESS); + ASSERT_EQ(ec, HDF_SUCCESS); for (auto inIter = inParam.begin(); inIter != inParam.end(); ++inIter) { auto outIter = outParam.find(inIter->first);