From d136f0843c1036f9d5c60185906553d7408e9295 Mon Sep 17 00:00:00 2001 From: wangyikai Date: Sat, 2 Nov 2024 09:24:30 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90hdf=5Fcore=E3=80=91hidumper=20-s=20510?= =?UTF-8?q?0=20-a=20'-host=20composer=5Fhost=20-module=20vdi=20-cmd=20buff?= =?UTF-8?q?er'=20=E6=97=A0=E6=B3=95=E9=80=80=E5=87=BA=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wangyikai --- adapter/uhdf2/manager/src/devmgr_dump.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/adapter/uhdf2/manager/src/devmgr_dump.c b/adapter/uhdf2/manager/src/devmgr_dump.c index 015df5057..25c80b3c2 100644 --- a/adapter/uhdf2/manager/src/devmgr_dump.c +++ b/adapter/uhdf2/manager/src/devmgr_dump.c @@ -613,41 +613,41 @@ static int32_t DevMgrDump(struct HdfSBuf *data, struct HdfSBuf *reply) if (argv == 0) { (void)HdfSbufWriteString(reply, HELP_COMMENT); + close(fd); return HDF_SUCCESS; } const char *value = HdfSbufReadString(data); if (value == NULL) { HDF_LOGE("%{public}s arg is invalid", __func__); + close(fd); return HDF_FAILURE; } HDF_LOGI("%{public}s argv:%{public}d", value, argv); + + int32_t ret = HDF_SUCCESS; if (argv == 1) { if (strcmp(value, "-help") == 0) { (void)HdfSbufWriteString(reply, HELP_COMMENT); - return HDF_SUCCESS; } else if (strcmp(value, "-query") == 0) { DevMgrQueryInfo(reply); - return HDF_SUCCESS; } else { (void)HdfSbufWriteString(reply, HELP_COMMENT); - return HDF_SUCCESS; } } else { if (strcmp(value, "-host") == 0) { - return DevMgrDumpHost(argv - 1, data, reply); + ret = DevMgrDumpHost(argv - 1, data, reply); } else if (strcmp(value, "-service") == 0) { - return DevMgrDumpService(argv - 1, data, reply); + ret = DevMgrDumpService(argv - 1, data, reply); } else if (strcmp(value, "--ipc") == 0) { - return DevMgrDumpIpc(fd, data, reply); + ret = DevMgrDumpIpc(fd, data, reply); } else { (void)HdfSbufWriteString(reply, HELP_COMMENT); - return HDF_SUCCESS; } } - - return HDF_SUCCESS; + close(fd); + return ret; } void DevMgrRegisterDumpFunc(void) -- Gitee