From 4a8ee10780f878259d87f3dc417577c828d5d679 Mon Sep 17 00:00:00 2001 From: chengyj1985 Date: Mon, 17 Oct 2022 16:38:49 +0800 Subject: [PATCH] Svace issue:Convert result of sizeof() to an int-type variable. Change-Id: I6485409e0cf6e3c7786f5dc149f173439ec78e66 --- lib/media-util-ipc.c | 2 +- src/server/media-server-dcm.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/media-util-ipc.c b/lib/media-util-ipc.c index c8fdab0..4052ba7 100755 --- a/lib/media-util-ipc.c +++ b/lib/media-util-ipc.c @@ -165,7 +165,7 @@ int ms_ipc_accept_client_tcp(int serv_sock, int* client_sock) MSAPI_RETV_IF(client_sock == NULL, MS_MEDIA_ERR_INVALID_PARAMETER); - client_addr_len = sizeof(client_addr); + client_addr_len = (socklen_t)sizeof(client_addr); if ((sockfd = accept(serv_sock, (struct sockaddr*)&client_addr, &client_addr_len)) < 0) { MSAPI_DBG_STRERROR("accept failed"); *client_sock = -1; diff --git a/src/server/media-server-dcm.c b/src/server/media-server-dcm.c index 5a0687e..1af8469 100755 --- a/src/server/media-server-dcm.c +++ b/src/server/media-server-dcm.c @@ -120,14 +120,14 @@ static int __ms_dcm_recv_msg(int sock, dcmMsg *msg) static gboolean __ms_dcm_agent_recv_msg_from_server(void) { struct sockaddr_un serv_addr; - unsigned int serv_addr_len; + socklen_t serv_addr_len; int sockfd = -1; int retry = 10; if (g_dcm_comm_sock <= 0) __ms_dcm_agent_prepare_tcp_socket(&g_dcm_comm_sock, MS_DCM_COMM_PORT); - serv_addr_len = sizeof(serv_addr); + serv_addr_len = (socklen_t)sizeof(serv_addr); if ((sockfd = accept(g_dcm_comm_sock, (struct sockaddr*)&serv_addr, &serv_addr_len)) < 0) { MS_DBG_STRERROR("accept failed"); @@ -367,7 +367,7 @@ static gboolean __ms_dcm_request_to_server(gpointer data) static gboolean __ms_dcm_agent_read_socket(GIOChannel *src, GIOCondition condition, gpointer data) { struct sockaddr_un client_addr; - unsigned int client_addr_len; + socklen_t client_addr_len; dcmMsg *recv_msg = NULL; dcmRequest *dcm_req = NULL; int sock = -1; @@ -376,7 +376,7 @@ static gboolean __ms_dcm_agent_read_socket(GIOChannel *src, GIOCondition conditi sock = g_io_channel_unix_get_fd(src); MS_DBG_RETVM_IF(sock < 0, G_SOURCE_CONTINUE, "sock fd is invalid!"); - client_addr_len = sizeof(client_addr); + client_addr_len = (socklen_t)sizeof(client_addr); if ((client_sock = accept(sock, (struct sockaddr*)&client_addr, &client_addr_len)) < 0) { MS_DBG_STRERROR("accept failed"); -- 2.7.4