[Epic-ID: ODUHIGH-576][Issue-ID: ODUHIGH-588][SubTask-ID: ODUHIGH-589] | [NFAPI_BRANC...

Change-Id: I9c6929ff83941e350dbb5497e948ad2240b2089f
Signed-off-by: pborla <pborla@radisys.com>
Signed-off-by: svaidhya <svaidhya@radisys.com>

diff --git a/src/5gnrmac/lwr_mac_nfapi.h b/src/5gnrmac/lwr_mac_nfapi.h
index 4b96f3c..995f823 100644 (file)
--- a/src/5gnrmac/lwr_mac_nfapi.h
+++ b/src/5gnrmac/lwr_mac_nfapi.h
@@ -1,12 +1,12 @@
  /*******************************************************************************
  ################################################################################
- #   Copyright (c) [20172019] [Radisys]                                        #
+ #   Copyright (c) [2017-2019] [Radisys]                                        #
  #                                                                              #
  #   Licensed under the Apache License, Version 2.0 (the "License");            #
  #   you may not use this file except in compliance with the License.           #
  #   You may obtain a copy of the License at                                    #
  #                                                                              #
- #       http://www.apache.org/licenses/LICENSE2.0                             #
+ #       http://www.apache.org/licenses/LICENSE-2.0                             #
  #                                                                              #
  #   Unless required by applicable law or agreed to in writing, software        #
  #   distributed under the License is distributed on an "AS IS" BASIS,          #
@@ -16,8 +16,8 @@
  ################################################################################
  *******************************************************************************/
 
-#ifndef _LWR_MAC_NFAPI_H_
-#define _LWR_MAC_NFAPI_H_
+ #ifndef _LWR_MAC_NFAPI_H_
+ #define _LWR_MAC_NFAPI_H_
 
 #include "nfapi_interface.h"
 

diff --git a/src/cm/cm_inet.c b/src/cm/cm_inet.c
index 69f8035..2104af3 100644 (file)
--- a/src/cm/cm_inet.c
+++ b/src/cm/cm_inet.c
@@ -1771,10 +1771,11 @@ CmInetNetAddrLst  *addrLst,      /* destination Internet address list */
 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 */
-   S32   idx;
+   S32   idx=0;
 
 /* cm_inet_c_001.main_64: New variable used as an argument for sctp_connectx */
 #ifdef SCTP_CONNECTX_NEW
@@ -2144,7 +2145,7 @@ uint16_t          port          /* port number */
 
 #endif /* CMINET_SUN_CONNECTX */
 #endif /* SS_LINUX */
-
+   tempErrorNo = INET_ERR_CODE;
    if (ret == INET_ERR)
    {
 #ifdef CMINETDBG
@@ -2152,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),"
-            " 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),\
-                  sockFd->fd(%d)\n", INET_ERR_CODE, port, sockFd->fd);
+                  sockFd->fd(%d)\n", tempErrorNo, port, sockFd->fd);
 #endif /*ALIGN_64BIT*/
 #endif /* CMINETDBG */
 
-      switch (INET_ERR_CODE)
+      switch (tempErrorNo)
       {
          /* non-blocking: connection is in progress */
          case ERR_INPROGRESS: