From 7f08226b431c92a25fddd6e5978fbf3d463571f9 Mon Sep 17 00:00:00 2001
From: zhanglianghy <zhanglianghy@cmhi.chinamobile.com>
Date: Tue, 13 Aug 2019 10:41:16 +0800
Subject: [PATCH] =?UTF-8?q?MOD=20aaa-12=20=E5=8E=BB=E6=8E=89=E8=BF=94?=
 =?UTF-8?q?=E9=94=99=E5=AD=97=E7=AC=A6=E4=B8=B2=E7=9A=84=E6=8D=A2=E8=A1=8C?=
 =?UTF-8?q?=E7=AC=A6=20SOL=20=20=20=E5=8E=BB=E6=8E=89=E8=BF=94=E9=94=99?=
 =?UTF-8?q?=E5=AD=97=E7=AC=A6=E4=B8=B2=E7=9A=84=E6=8D=A2=E8=A1=8C=E7=AC=A6?=
 =?UTF-8?q?=20=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

---
 Platform/common/rpc/rpc_common.h                              | 4 ++--
 Platform/common/rpc/rpc_util.h                                | 4 ++--
 .../user/configm/config-server/netconfig/bridge/brconfig.c    | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Platform/common/rpc/rpc_common.h b/Platform/common/rpc/rpc_common.h
index bb636a5da..3311f8520 100755
--- a/Platform/common/rpc/rpc_common.h
+++ b/Platform/common/rpc/rpc_common.h
@@ -36,7 +36,7 @@ typedef enum {
     RET_NOTSUPPORT = 11,
     RET_INPUTERR = 12,
     RET_IPINVALID = 13,
-    RET_BR_INVALID = 14,
+    RET_NAMEINVAL = 14,
     RET_EXIST = 15,
     RET_FULL = 16
 } ret_code;
@@ -57,7 +57,7 @@ typedef enum {
     { RET_NOTSUPPORT, "NotSupport"},\
     { RET_INPUTERR,   "InputError"},\
     { RET_IPINVALID,  "IpInvalid"},\
-    { RET_BR_INVALID, "BrNameInvalid"},\
+    { RET_NAMEINVAL, "NameInvalid"},\
     { RET_EXIST, "AlreadyExist"},\
     { RET_FULL, "FULL"}\
 }
diff --git a/Platform/common/rpc/rpc_util.h b/Platform/common/rpc/rpc_util.h
index faac2446b..5d2fd59fb 100755
--- a/Platform/common/rpc/rpc_util.h
+++ b/Platform/common/rpc/rpc_util.h
@@ -106,13 +106,13 @@ do { \
 do { \
     if(ret == RET_SYSERR)\
     {\
-        sprintf(buff, "%s\n", strerror(errno));\
+        sprintf(buff, "%s", strerror(errno));\
         (buff_size) = strlen(buff);\
         (buff_size)++;\
     }\
     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)++;\
     }\
diff --git a/Platform/user/configm/config-server/netconfig/bridge/brconfig.c b/Platform/user/configm/config-server/netconfig/bridge/brconfig.c
index b6cb11c58..a344c31ad 100644
--- a/Platform/user/configm/config-server/netconfig/bridge/brconfig.c
+++ b/Platform/user/configm/config-server/netconfig/bridge/brconfig.c
@@ -122,11 +122,11 @@ ret_code br_name_chk(char *br_name)
        || strlen(br_name) > BR_NAMSIZ - 1
        || strstr(br_name, "br-vl") != NULL)
     {
-        return RET_BR_INVALID;
+        return RET_NAMEINVAL;
     }
     if(br_name[0] != 'b' || br_name[1] != 'r')
     {
-        return RET_BR_INVALID;
+        return RET_NAMEINVAL;
     }
 
     return RET_OK;