From 4547ca9354ef98cbcdf581b20761bc877caeb0ce Mon Sep 17 00:00:00 2001 From: huyx Date: Wed, 5 Jun 2024 15:44:06 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8DTDD=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: huyx --- adapter/uhdf2/manager/src/devmgr_service_stub.c | 2 +- framework/tools/hdi-gen/ast/ast_enum_type.h | 2 +- .../tools/hdi-gen/codegen/java_client_proxy_code_emitter.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/adapter/uhdf2/manager/src/devmgr_service_stub.c b/adapter/uhdf2/manager/src/devmgr_service_stub.c index ab4d6d6b2..ad7b82989 100644 --- a/adapter/uhdf2/manager/src/devmgr_service_stub.c +++ b/adapter/uhdf2/manager/src/devmgr_service_stub.c @@ -152,7 +152,7 @@ int32_t DevmgrServiceStubDispatch(struct HdfRemoteService *stub, int code, struc HDF_LOGE("%{public}s devmgr service stub dispach failed, cmd id is %{public}d, ret = %{public}d", __func__, code, ret); } - return ret; + return HDF_SUCCESS; } static void RemoveModule(const char *module) diff --git a/framework/tools/hdi-gen/ast/ast_enum_type.h b/framework/tools/hdi-gen/ast/ast_enum_type.h index 0a37586bd..1ea384d43 100644 --- a/framework/tools/hdi-gen/ast/ast_enum_type.h +++ b/framework/tools/hdi-gen/ast/ast_enum_type.h @@ -110,7 +110,7 @@ public: return members_[index]; } - inline bool HasMember(std::string memberName) + inline bool HasMember(const std::string memberName) { for (size_t i = 0; i < members_.size(); i++) { if (members_[i]->GetName() == memberName) { diff --git a/framework/tools/hdi-gen/codegen/java_client_proxy_code_emitter.cpp b/framework/tools/hdi-gen/codegen/java_client_proxy_code_emitter.cpp index 0108ec0f2..b05cb2cec 100644 --- a/framework/tools/hdi-gen/codegen/java_client_proxy_code_emitter.cpp +++ b/framework/tools/hdi-gen/codegen/java_client_proxy_code_emitter.cpp @@ -114,7 +114,7 @@ void JavaClientProxyCodeEmitter::EmitProxyImpl(StringBuilder &sb) EmitProxyConstants(sb, TAB); sb.Append("\n"); sb.Append(TAB).AppendFormat( - "private static final HiLogLabel TAG = new HiLogLabel(HiLog.LOG_CORE, 0xD001510, \"%s\");\n", + "private static final HiLogLabel TAG = new HiLogLabel(HiLog.LOG_CORE, 0xD002510, \"%s\");\n", interfaceFullName_.c_str()); sb.Append(TAB).Append("private final IRemoteObject remote;\n"); sb.Append(TAB).Append("private static final int ERR_OK = 0;\n"); -- Gitee From 2a47176844d8f95af686b8bd0c38dededee6633c Mon Sep 17 00:00:00 2001 From: huyx Date: Wed, 5 Jun 2024 15:46:03 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8DTDD=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: huyx --- framework/tools/hdi-gen/ast/ast_expr.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/framework/tools/hdi-gen/ast/ast_expr.cpp b/framework/tools/hdi-gen/ast/ast_expr.cpp index e5f6d806f..075e0ad05 100644 --- a/framework/tools/hdi-gen/ast/ast_expr.cpp +++ b/framework/tools/hdi-gen/ast/ast_expr.cpp @@ -98,7 +98,7 @@ std::string ASTNumExpr::Dump(const std::string &prefix) sb.AppendFormat("%s", value_.c_str()); if (isParenExpr) { - sb.Append("("); + sb.Append(")"); } return sb.ToString(); @@ -115,7 +115,7 @@ std::string ASTEnumExpr::Dump(const std::string &prefix) sb.AppendFormat("%s", value_.c_str()); if (isParenExpr) { - sb.Append("("); + sb.Append(")"); } return sb.ToString(); -- Gitee From cf8722febabf121f3674b67d27b9d5ced50ffda2 Mon Sep 17 00:00:00 2001 From: huyx Date: Thu, 6 Jun 2024 09:47:55 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: huyx --- framework/tools/hdi-gen/ast/ast_enum_type.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework/tools/hdi-gen/ast/ast_enum_type.h b/framework/tools/hdi-gen/ast/ast_enum_type.h index 1ea384d43..7bfbff866 100644 --- a/framework/tools/hdi-gen/ast/ast_enum_type.h +++ b/framework/tools/hdi-gen/ast/ast_enum_type.h @@ -110,7 +110,7 @@ public: return members_[index]; } - inline bool HasMember(const std::string memberName) + inline bool HasMember(const std::string &memberName) { for (size_t i = 0; i < members_.size(); i++) { if (members_[i]->GetName() == memberName) { -- Gitee