Changeset 4865 for mpich2/trunk/src/mpid/ch3/channels/nemesis/nemesis/netmod/tcp/tcp_init.c

Timestamp:

06/30/09 14:41:53 (5 months ago)

Author:

buntinas

Message:

stomped some warnings

Files:

• mpich2/trunk/src/mpid/ch3/channels/nemesis/nemesis/netmod/tcp/tcp_init.c (modified) (1 diff)

mpich2/trunk/src/mpid/ch3/channels/nemesis/nemesis/netmod/tcp/tcp_init.c

@@ -232 +232 @@
         }
     }
-
+    
+    if (ifaddr.len > 0 && ifaddr.type == AF_INET)
     {
-        char ifname[256];
-        unsigned char *p;
-        if (ifaddr.len > 0 && ifaddr.type == AF_INET)
+        unsigned char *p;
+        p = (unsigned char *)(ifaddr.ifaddr);
+        MPIU_Snprintf( ifname, sizeof(ifname), "%u.%u.%u.%u", p[0], p[1], p[2], p[3] );
+        MPIU_DBG_MSG_S(CH3_CONNECT,VERBOSE,"ifname = %s",ifname );
+        mpi_errno = MPIU_Str_add_string_arg(bc_val_p, val_max_sz_p, MPIDI_CH3I_IFNAME_KEY, ifname);
+        if (mpi_errno != MPIU_STR_SUCCESS)
         {
-            p = (unsigned char *)(ifaddr.ifaddr);
-            MPIU_Snprintf( ifname, sizeof(ifname), "%u.%u.%u.%u", p[0], p[1], p[2], p[3] );
-            MPIU_DBG_MSG_S(CH3_CONNECT,VERBOSE,"ifname = %s",ifname );
-            mpi_errno = MPIU_Str_add_string_arg(bc_val_p, val_max_sz_p, MPIDI_CH3I_IFNAME_KEY, ifname);
-            if (mpi_errno != MPIU_STR_SUCCESS)
+            if (mpi_errno == MPIU_STR_NOMEM)
             {
-                if (mpi_errno == MPIU_STR_NOMEM)
-                {
-                    MPIU_ERR_SETANDJUMP(mpi_errno, MPI_ERR_OTHER, "**buscard_len");
-                }
-                else
-                {
-                    MPIU_ERR_SETANDJUMP(mpi_errno, MPI_ERR_OTHER, "**buscard");
-                }
-            }
-        }
-    }
+                MPIU_ERR_SETANDJUMP(mpi_errno, MPI_ERR_OTHER, "**buscard_len");
+            }
+            else
+            {
+                MPIU_ERR_SETANDJUMP(mpi_errno, MPI_ERR_OTHER, "**buscard");
+            }
+        }
+    }
+    
 
     /*     printf("MPID_nem_tcp_get_business_card. port=%d\n", sock_id.sin_port); */