From a62795304da31e13021ea2c675d124afd2594102 Mon Sep 17 00:00:00 2001 From: pef Date: Tue, 12 Oct 2021 12:43:56 +0000 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=8E=BB=E6=8E=89=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=E7=9A=84=E5=85=A5=E5=8F=82consoleid=E3=80=82?= =?UTF-8?q?=20=E3=80=90=E8=83=8C=E6=99=AF=E3=80=91=20https://gitee.com/ope?= =?UTF-8?q?nharmony/kernel=5Fliteos=5Fm/blob/master/components/shell/src/b?= =?UTF-8?q?ase/show.c=20L49=20consoleid=20=E5=87=BD=E6=95=B0=E4=B8=AD?= =?UTF-8?q?=E6=B2=A1=E6=9C=89=E4=BD=BF=E7=94=A8=EF=BC=8C=E5=BA=94=E8=AF=A5?= =?UTF-8?q?=E6=94=B9=E4=B8=BAVOID=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 【修改方案】 1. 将consoleid改为VOID。 【影响】 对现有的产品编译不会有影响。 re #I43CVE Change-Id: Ieac29d16ec06c4fa45652c7106b63f6dd8397ebf Signed-off-by: pef --- components/shell/include/show.h | 2 +- components/shell/src/base/shmsg.c | 2 +- components/shell/src/base/show.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/components/shell/include/show.h b/components/shell/include/show.h index 7b05b8e9..6bb81f1b 100644 --- a/components/shell/include/show.h +++ b/components/shell/include/show.h @@ -43,7 +43,7 @@ extern "C" { #endif /* __cplusplus */ extern CHAR *OsShellGetWorkingDirtectory(VOID); -extern UINT32 OsShellInit(INT32 consoleId); +extern UINT32 OsShellInit(VOID); extern INT32 OsShellDeinit(INT32 consoleId); static inline void SetErrno(int errcode) diff --git a/components/shell/src/base/shmsg.c b/components/shell/src/base/shmsg.c index 2e3e7ca6..b53a6ac2 100755 --- a/components/shell/src/base/shmsg.c +++ b/components/shell/src/base/shmsg.c @@ -213,7 +213,7 @@ LITE_OS_SEC_TEXT_MINOR VOID ExecCmdline(const CHAR *cmdline) return; } - OsShellInit(0); + (VOID)OsShellInit(); /* strip out unnecessary characters */ ret = PreHandleCmdline(cmdline, &output, &outputlen); diff --git a/components/shell/src/base/show.c b/components/shell/src/base/show.c index b52bba13..c4952fab 100755 --- a/components/shell/src/base/show.c +++ b/components/shell/src/base/show.c @@ -46,7 +46,7 @@ STATIC UINT32 OsShellCmdInit(VOID) return OsShellSysCmdRegister(); } -UINT32 OsShellInit(INT32 consoleId) +UINT32 OsShellInit(VOID) { if (g_shellSourceFlag == FALSE) { UINT32 ret = OsShellCmdInit();