Code Review
/
o-du
/
l2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "CI: Add silent cmake SonarCloud scan"
[o-du/l2.git]
/
src
/
cm
/
cm_inet.c
diff --git
a/src/cm/cm_inet.c
b/src/cm/cm_inet.c
index
0278b08
..
2104af3
100644
(file)
--- a/
src/cm/cm_inet.c
+++ b/
src/cm/cm_inet.c
@@
-45,12
+45,7
@@
\f
/* header include files (.h) */
\f
/* header include files (.h) */
-#include "envopt.h" /* environment options */
-#include "envdep.h" /* environment dependent */
-#include "envind.h" /* environment independent */
-
-#include "gen.h" /* general */
-#include "ssi.h" /* system services interface */
+#include "common_def.h"
#include "cm_inet.h" /* socket library file */
/*cm_inet_c_001.main_35 : Updated for C++ compilation */
#include "cm_inet.h" /* socket library file */
/*cm_inet_c_001.main_35 : Updated for C++ compilation */
@@
-145,14
+140,10
@@
extern "C" {
#endif /* __cplusplus */
/* header/extern include files (.x) */
#endif /* __cplusplus */
/* header/extern include files (.x) */
-#include "gen.x" /* general */
-#include "ssi.x" /* system services interface */
#include "cm_inet.x" /* socket library file */
#include "cm_inet.x" /* socket library file */
-#include "cm_lib.x" /* lib library file */
#ifdef NTL_LIB
#include "ntl_lib.h"
#endif
#ifdef NTL_LIB
#include "ntl_lib.h"
#endif
-#include "du_log.h"
\f
/* local defines */
\f
/* local defines */
@@
-1780,10
+1771,11
@@
CmInetNetAddrLst *addrLst, /* destination Internet address list */
uint16_t port /* port number */
)
{
uint16_t port /* port number */
)
{
- S32 ret;
- uint32_t cnt;
+ int32_t tempErrorNo=0;
+ S32 ret =0;
+ uint32_t cnt=0;
/* cm_inet_c_001.main_46: Removed SS_LINUX flag */
/* cm_inet_c_001.main_46: Removed SS_LINUX flag */
- S32 idx;
+ S32 idx
=0
;
/* cm_inet_c_001.main_64: New variable used as an argument for sctp_connectx */
#ifdef SCTP_CONNECTX_NEW
/* cm_inet_c_001.main_64: New variable used as an argument for sctp_connectx */
#ifdef SCTP_CONNECTX_NEW
@@
-2153,7
+2145,7
@@
uint16_t port /* port number */
#endif /* CMINET_SUN_CONNECTX */
#endif /* SS_LINUX */
#endif /* CMINET_SUN_CONNECTX */
#endif /* SS_LINUX */
-
+ tempErrorNo = INET_ERR_CODE;
if (ret == INET_ERR)
{
#ifdef CMINETDBG
if (ret == INET_ERR)
{
#ifdef CMINETDBG
@@
-2161,15
+2153,15
@@
uint16_t port /* port number */
/* cm_inet_c_001.main_54: CMINETLOGERROR added insted of SDisp */
/* cm_inet_c_001.main_62:Warning fix */
snprintf(prntBuf, CMINET_PRNT_BUF_SIZE, "CmInetSctpConnectx() Failed : error(%d), port(0x%1x),"
/* cm_inet_c_001.main_54: CMINETLOGERROR added insted of SDisp */
/* cm_inet_c_001.main_62:Warning fix */
snprintf(prntBuf, CMINET_PRNT_BUF_SIZE, "CmInetSctpConnectx() Failed : error(%d), port(0x%1x),"
- " sockFd->fd(%ld)\n",
INET_ERR_CODE
, port, sockFd->fd);
+ " sockFd->fd(%ld)\n",
tempErrorNo
, port, sockFd->fd);
CMINETLOGERROR(ERRCLS_DEBUG, ECMINET010, 0, prntBuf);
#else
DU_LOG("\nCmInetSctpConnectx() Failed : error(%d), port(0x%1x),\
CMINETLOGERROR(ERRCLS_DEBUG, ECMINET010, 0, prntBuf);
#else
DU_LOG("\nCmInetSctpConnectx() Failed : error(%d), port(0x%1x),\
- sockFd->fd(%d)\n",
INET_ERR_CODE
, port, sockFd->fd);
+ sockFd->fd(%d)\n",
tempErrorNo
, port, sockFd->fd);
#endif /*ALIGN_64BIT*/
#endif /* CMINETDBG */
#endif /*ALIGN_64BIT*/
#endif /* CMINETDBG */
- switch (
INET_ERR_CODE
)
+ switch (
tempErrorNo
)
{
/* non-blocking: connection is in progress */
case ERR_INPROGRESS:
{
/* non-blocking: connection is in progress */
case ERR_INPROGRESS: