From 14813701e8a87120189144a5210502df578cc924 Mon Sep 17 00:00:00 2001 From: zhanglianghy Date: Fri, 5 Jul 2019 16:39:50 +0800 Subject: [PATCH] =?UTF-8?q?MOD=20aaa-12=20=E4=BC=98=E5=8C=96getall?= =?UTF-8?q?=E5=87=BD=E6=95=B0=E5=8F=82=E6=95=B0=EF=BC=8C=E5=8E=BB=E9=99=A4?= =?UTF-8?q?=E6=97=A0=E7=94=A8=E5=8F=82=E6=95=B0=20SOL=20=20=E4=BC=98?= =?UTF-8?q?=E5=8C=96getall=E5=87=BD=E6=95=B0=E5=8F=82=E6=95=B0=EF=BC=8C?= =?UTF-8?q?=E5=8E=BB=E9=99=A4=E6=97=A0=E7=94=A8=E5=8F=82=E6=95=B0=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=BA=EF=BC=9Azhangliang=20=E6=A3=80?= =?UTF-8?q?=E8=A7=86=E4=BA=BA=EF=BC=9Azhangliang?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../user/configm/config-server/configserver.c | 23 +------------------ 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/Platform/user/configm/config-server/configserver.c b/Platform/user/configm/config-server/configserver.c index 149a4e6e6..6fbe53577 100644 --- a/Platform/user/configm/config-server/configserver.c +++ b/Platform/user/configm/config-server/configserver.c @@ -206,9 +206,7 @@ void cm_config_process(rpc_conn *conn, pointer input, int input_len, void* data) char *cm_get_buff = NULL; ret_code ret = RET_OK; int config_len = 0; - short* single_len = NULL; int buff_len = CM_BUFF_SIZE; - int index = 0, cnt = 0; if(conn == NULL || input == NULL) { @@ -286,24 +284,10 @@ void cm_config_process(rpc_conn *conn, pointer input, int input_len, void* data) case CM_CONFIG_GET_ALL: if(config_svr->getall_callback) { - single_len = rpc_new(short, CM_BUFF_SIZE); - if(single_len == NULL) - { - rpc_return_error(conn, RET_NOMEM, "not enough memery"); - goto exit; - } ret = config_svr->getall_callback(config_msg->source, - config_svr->config_id, cm_get_buff, - single_len, - &cnt); - - buff_len = 0; - for(index = 0 ; index < cnt; index++) - { - buff_len = buff_len + single_len[index]; - } + &buff_len); } break; @@ -336,11 +320,6 @@ void cm_config_process(rpc_conn *conn, pointer input, int input_len, void* data) exit: rpc_free(cm_get_buff); - if(single_len != NULL) - { - rpc_free(single_len); - } - return; }