From 7815064b48f076753401cd15cdc4cfa95a74cf7a Mon Sep 17 00:00:00 2001 From: laiguizhong Date: Mon, 25 Jul 2022 19:12:06 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8B=BC=E5=86=99=E9=94=99?= =?UTF-8?q?=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: laiguizhong --- interfaces/innerkits/control_fd/control_fd_client.c | 8 ++++---- interfaces/innerkits/control_fd/control_fd_service.c | 4 ++-- interfaces/innerkits/include/service_control.h | 2 +- services/loopevent/include/loop_event.h | 4 ++-- services/loopevent/task/le_streamtask.c | 12 ++++++------ services/loopevent/task/le_task.h | 4 ++-- services/param/linux/param_msgadp.c | 2 +- services/utils/init_utils.c | 2 +- 8 files changed, 19 insertions(+), 19 deletions(-) diff --git a/interfaces/innerkits/control_fd/control_fd_client.c b/interfaces/innerkits/control_fd/control_fd_client.c index 75da991d8..7011d9a9e 100644 --- a/interfaces/innerkits/control_fd/control_fd_client.c +++ b/interfaces/innerkits/control_fd/control_fd_client.c @@ -68,9 +68,9 @@ static void CmdOnRecvMessage(const TaskHandle task, const uint8_t *buffer, uint3 BEGET_LOGI("[control_fd] CmdOnRecvMessage %s len %d.", (char *)buffer, buffLen); } -static void CmdOnConntectComplete(const TaskHandle client) +static void CmdOnConnectComplete(const TaskHandle client) { - BEGET_LOGI("[control_fd] CmdOnConntectComplete"); + BEGET_LOGI("[control_fd] CmdOnConnectComplete"); } static void CmdOnClose(const TaskHandle task) @@ -105,8 +105,8 @@ static CmdAgent *CmdAgentCreate(const char *server) info.server = (char *)server; info.baseInfo.userDataSize = sizeof(CmdAgent); info.baseInfo.close = CmdOnClose; - info.disConntectComplete = CmdDisConnectComplete; - info.connectComplete = CmdOnConntectComplete; + info.disConnectComplete = CmdDisConnectComplete; + info.connectComplete = CmdOnConnectComplete; info.sendMessageComplete = CmdOnSendMessageComplete; info.recvMessage = CmdOnRecvMessage; LE_STATUS status = LE_CreateStreamClient(LE_GetDefaultLoop(), &task, &info); diff --git a/interfaces/innerkits/control_fd/control_fd_service.c b/interfaces/innerkits/control_fd/control_fd_service.c index 796824490..a174a4065 100644 --- a/interfaces/innerkits/control_fd/control_fd_service.c +++ b/interfaces/innerkits/control_fd/control_fd_service.c @@ -100,7 +100,7 @@ static int CmdOnIncommingConntect(const LoopHandle loop, const TaskHandle server info.baseInfo.flags = TASK_STREAM | TASK_PIPE | TASK_CONNECT; info.baseInfo.close = OnClose; info.baseInfo.userDataSize = sizeof(CmdTask); - info.disConntectComplete = NULL; + info.disConnectComplete = NULL; info.sendMessageComplete = NULL; info.recvMessage = CmdOnRecvMessage; int ret = LE_AcceptStreamClient(LE_GetDefaultLoop(), server, &client, &info); @@ -127,7 +127,7 @@ void CmdServiceInit(const char *socketPath, CallbackControlFdProcess func) info.server = (char *)socketPath; info.socketId = -1; info.baseInfo.close = NULL; - info.disConntectComplete = NULL; + info.disConnectComplete = NULL; info.incommingConntect = CmdOnIncommingConntect; info.sendMessageComplete = NULL; info.recvMessage = NULL; diff --git a/interfaces/innerkits/include/service_control.h b/interfaces/innerkits/include/service_control.h index ba77b8667..ff21c4f98 100644 --- a/interfaces/innerkits/include/service_control.h +++ b/interfaces/innerkits/include/service_control.h @@ -37,7 +37,7 @@ typedef enum { SERVICE_SUSPENDED, SERVICE_FREEZED, SERVICE_DISABLED, - SERVICE_CRITIAL + SERVICE_CRITICAL } ServiceStatus; enum ServiceAction { diff --git a/services/loopevent/include/loop_event.h b/services/loopevent/include/loop_event.h index cfa3a78c0..c9544a63e 100644 --- a/services/loopevent/include/loop_event.h +++ b/services/loopevent/include/loop_event.h @@ -102,7 +102,7 @@ typedef struct { LE_BaseInfo baseInfo; char *server; int socketId; - LE_DisConntectComplete disConntectComplete; + LE_DisConntectComplete disConnectComplete; LE_IncommingConntect incommingConntect; LE_SendMessageComplete sendMessageComplete; LE_RecvMessage recvMessage; @@ -111,7 +111,7 @@ typedef struct { typedef struct { LE_BaseInfo baseInfo; char *server; - LE_DisConntectComplete disConntectComplete; + LE_DisConntectComplete disConnectComplete; LE_ConntectComplete connectComplete; LE_SendMessageComplete sendMessageComplete; LE_RecvMessage recvMessage; diff --git a/services/loopevent/task/le_streamtask.c b/services/loopevent/task/le_streamtask.c index 73f9304bd..be32f250a 100644 --- a/services/loopevent/task/le_streamtask.c +++ b/services/loopevent/task/le_streamtask.c @@ -93,8 +93,8 @@ static LE_STATUS HandleStreamEvent_(const LoopHandle loopHandle, const TaskHandl } if (status == LE_DIS_CONNECTED) { loop->delEvent(loop, GetSocketFd(handle), Event_Read | Event_Write); - if (stream->disConntectComplete) { - stream->disConntectComplete(handle); + if (stream->disConnectComplete) { + stream->disConnectComplete(handle); } LE_CloseStreamTask(loopHandle, handle); } @@ -116,8 +116,8 @@ static LE_STATUS HandleClientEvent_(const LoopHandle loopHandle, const TaskHandl status = HandleRecvMsg_(loopHandle, handle, client->recvMessage); } if (status == LE_DIS_CONNECTED) { - if (client->disConntectComplete) { - client->disConntectComplete(handle); + if (client->disConnectComplete) { + client->disConnectComplete(handle); } client->connected = 0; LE_CloseStreamTask(loopHandle, handle); @@ -201,7 +201,7 @@ LE_STATUS LE_CreateStreamClient(const LoopHandle loopHandle, task->connectComplete = info->connectComplete; task->sendMessageComplete = info->sendMessageComplete; task->recvMessage = info->recvMessage; - task->disConntectComplete = info->disConntectComplete; + task->disConnectComplete = info->disConnectComplete; EventLoop *loop = (EventLoop *)loopHandle; loop->addEvent(loop, (const BaseTask *)task, Event_Read); *taskHandle = (TaskHandle)task; @@ -225,7 +225,7 @@ LE_STATUS LE_AcceptStreamClient(const LoopHandle loopHandle, const TaskHandle se return LE_NO_MEMORY, "Failed to create task"); task->stream.base.handleEvent = HandleStreamEvent_; task->stream.base.innerClose = HandleStreamTaskClose_; - task->disConntectComplete = info->disConntectComplete; + task->disConnectComplete = info->disConnectComplete; task->sendMessageComplete = info->sendMessageComplete; task->recvMessage = info->recvMessage; task->serverTask = (StreamServerTask *)server; diff --git a/services/loopevent/task/le_task.h b/services/loopevent/task/le_task.h index 98c5a94cb..f05ada9a8 100644 --- a/services/loopevent/task/le_task.h +++ b/services/loopevent/task/le_task.h @@ -91,12 +91,12 @@ typedef struct { StreamServerTask *serverTask; LE_SendMessageComplete sendMessageComplete; LE_RecvMessage recvMessage; - LE_DisConntectComplete disConntectComplete; + LE_DisConntectComplete disConnectComplete; } StreamConnectTask; typedef struct { StreamTask stream; - LE_DisConntectComplete disConntectComplete; + LE_DisConntectComplete disConnectComplete; LE_ConntectComplete connectComplete; LE_SendMessageComplete sendMessageComplete; LE_RecvMessage recvMessage; diff --git a/services/param/linux/param_msgadp.c b/services/param/linux/param_msgadp.c index 038a35ac1..3d04be463 100644 --- a/services/param/linux/param_msgadp.c +++ b/services/param/linux/param_msgadp.c @@ -69,7 +69,7 @@ int ParamStreamCreate(ParamTaskPtr *stream, ParamTaskPtr server, info.baseInfo.flags |= TASK_TEST; } info.baseInfo.close = streamInfo->close; - info.disConntectComplete = NULL; + info.disConnectComplete = NULL; info.sendMessageComplete = NULL; info.recvMessage = OnReceiveRequest; g_recvMessage = streamInfo->recvMessage; diff --git a/services/utils/init_utils.c b/services/utils/init_utils.c index 717f4ea54..ee2812672 100644 --- a/services/utils/init_utils.c +++ b/services/utils/init_utils.c @@ -545,7 +545,7 @@ const static InitArgInfo g_servieStatusMap[] = { {"suspended", SERVICE_SUSPENDED}, {"freezed", SERVICE_FREEZED}, {"disabled", SERVICE_DISABLED}, - {"critial", SERVICE_CRITIAL} + {"critical", SERVICE_CRITICAL} }; const InitArgInfo *GetServieStatusMap(int *size)