[mpich2-commits] r5387 - mpich2/trunk/src/mpid/ch3/util/sock

[gropp at mcs.anl.gov]

Author: gropp
Date: 2009-10-01 11:40:41 -0500 (Thu, 01 Oct 2009)
New Revision: 5387

Modified:
   mpich2/trunk/src/mpid/ch3/util/sock/ch3u_connect_sock.c
Log:
avoid warnings about ifname declaration shadowing another declaration

Modified: mpich2/trunk/src/mpid/ch3/util/sock/ch3u_connect_sock.c
===================================================================
--- mpich2/trunk/src/mpid/ch3/util/sock/ch3u_connect_sock.c	2009-10-01 16:31:56 UTC (rev 5386)
+++ mpich2/trunk/src/mpid/ch3/util/sock/ch3u_connect_sock.c	2009-10-01 16:40:41 UTC (rev 5387)
@@ -434,13 +434,13 @@
 {
     int mpi_errno = MPI_SUCCESS;
     MPIDU_Sock_ifaddr_t ifaddr;
-    char ifname[MAX_HOST_DESCRIPTION_LEN];
+    char ifnamestr[MAX_HOST_DESCRIPTION_LEN];
     char *bc_orig = *bc_val_p;
     MPIDI_STATE_DECL(MPID_STATE_MPIDI_CH3U_GET_BUSINESS_CARD_SOCK);
 
     MPIDI_FUNC_ENTER(MPID_STATE_MPIDI_CH3U_GET_BUSINESS_CARD_SOCK);
 
-    MPIDU_CH3U_GetSockInterfaceAddr( myRank, ifname, sizeof(ifname), &ifaddr );
+    MPIDU_CH3U_GetSockInterfaceAddr( myRank, ifnamestr, sizeof(ifnamestr), &ifaddr );
 
     mpi_errno = MPIU_Str_add_int_arg(bc_val_p, val_max_sz_p, 
 			     MPIDI_CH3I_PORT_KEY, MPIDI_CH3I_listener_port);
@@ -457,7 +457,7 @@
     /* --END ERROR HANDLING-- */
     
     mpi_errno = MPIU_Str_add_string_arg(bc_val_p, val_max_sz_p, 
-			   MPIDI_CH3I_HOST_DESCRIPTION_KEY, ifname );
+			   MPIDI_CH3I_HOST_DESCRIPTION_KEY, ifnamestr );
     /* --BEGIN ERROR HANDLING-- */
     if (mpi_errno != MPIU_STR_SUCCESS)
     {
@@ -536,12 +536,9 @@
 	    }
 	}
     }
-    
-    if (0) {
-	fprintf( stdout, "business card is %s\n", bc_orig );
-	fflush(stdout);
-    }
 
+    MPIU_DBG_MSG_S(CH3_CONNECT,TYPICAL,"business card is %s\n", bc_orig );
+
  fn_exit:
     MPIDI_FUNC_EXIT(MPID_STATE_MPIDI_CH3U_GET_BUSINESS_CARD_SOCK);
     return mpi_errno;