cmhi
/
secgateway
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MOD aaa-12 去掉返错字符串的换行符 

SOL   去掉返错字符串的换行符
修改人：zhangliang
检视人：zhangliang
This commit is contained in:
zhanglianghy 2019-08-13 10:41:16 +08:00
parent 60f9e19435
commit 7f08226b43
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Platform/common/rpc/rpc_common.h
View File

@ -36,7 +36,7 @@ typedef enum {
RET_NOTSUPPORT = 11, RET_NOTSUPPORT = 11,
RET_INPUTERR = 12, RET_INPUTERR = 12,
RET_IPINVALID = 13, RET_IPINVALID = 13,
RET_BR_INVALID = 14, RET_NAMEINVAL = 14,
RET_EXIST = 15, RET_EXIST = 15,
RET_FULL = 16 RET_FULL = 16
} ret_code; } ret_code;
@ -57,7 +57,7 @@ typedef enum {
{ RET_NOTSUPPORT, "NotSupport"},\ { RET_NOTSUPPORT, "NotSupport"},\
{ RET_INPUTERR, "InputError"},\ { RET_INPUTERR, "InputError"},\
{ RET_IPINVALID, "IpInvalid"},\ { RET_IPINVALID, "IpInvalid"},\
{ RET_BR_INVALID, "BrNameInvalid"},\ { RET_NAMEINVAL, "NameInvalid"},\
{ RET_EXIST, "AlreadyExist"},\ { RET_EXIST, "AlreadyExist"},\
{ RET_FULL, "FULL"}\ { RET_FULL, "FULL"}\
} }

4
Platform/common/rpc/rpc_util.h
View File

@ -106,13 +106,13 @@ do { \
do { \ do { \
if(ret == RET_SYSERR)\ if(ret == RET_SYSERR)\
{\ {\
sprintf(buff, "%s\n", strerror(errno));\ sprintf(buff, "%s", strerror(errno));\
(buff_size) = strlen(buff);\ (buff_size) = strlen(buff);\
(buff_size)++;\ (buff_size)++;\
}\ }\
else if(ret != RET_OK)\ else if(ret != RET_OK)\
{\ {\
sprintf(buff, "%s\n", rpc_code_format(ret));\ sprintf(buff, "%s", rpc_code_format(ret));\
(buff_size) = strlen(buff);\ (buff_size) = strlen(buff);\
(buff_size)++;\ (buff_size)++;\
}\ }\

4
Platform/user/configm/config-server/netconfig/bridge/brconfig.c
View File

@ -122,11 +122,11 @@ ret_code br_name_chk(char *br_name)
|| strlen(br_name) > BR_NAMSIZ - 1 || strlen(br_name) > BR_NAMSIZ - 1
|| strstr(br_name, "br-vl") != NULL) || strstr(br_name, "br-vl") != NULL)
{ {
return RET_BR_INVALID; return RET_NAMEINVAL;
} }
if(br_name[0] != 'b' || br_name[1] != 'r') if(br_name[0] != 'b' || br_name[1] != 'r')
{ {
return RET_BR_INVALID; return RET_NAMEINVAL;
} }
return RET_OK; return RET_OK;