Index: /mpich2/trunk/src/mpid/common/datatype/mpid_ext32_datatype.c
===================================================================
--- /mpich2/trunk/src/mpid/common/datatype/mpid_ext32_datatype.c (revision 100)
+++ /mpich2/trunk/src/mpid/common/datatype/mpid_ext32_datatype.c (revision 4865)
@@ -60,5 +60,5 @@
 {
     MPI_Aint ret = (MPI_Aint) 0;
-    int i = 0;
+    unsigned int i = 0;
     for(i = 0; i < (sizeof(external32_basic_size_array) /
                     sizeof(external32_basic_size_t)); i++)
Index: /mpich2/trunk/src/mpid/common/datatype/dataloop/dataloop_create_contig.c
===================================================================
--- /mpich2/trunk/src/mpid/common/datatype/dataloop/dataloop_create_contig.c (revision 100)
+++ /mpich2/trunk/src/mpid/common/datatype/dataloop/dataloop_create_contig.c (revision 4865)
@@ -127,10 +127,4 @@
 	else
 	{
-	    DLOOP_Dataloop *old_loop_ptr;
-	    int old_loop_sz = 0;
-
-	    DLOOP_Handle_get_loopptr_macro(oldtype, old_loop_ptr, flag);
-	    DLOOP_Handle_get_loopsize_macro(oldtype, old_loop_sz, flag);
-
 	    /* allocate space for new loop including copy of old */
 	    PREPEND_PREFIX(Dataloop_alloc_and_copy)(DLOOP_KIND_CONTIG,
Index: /mpich2/trunk/src/mpid/common/datatype/dataloop/dataloop_create_struct.c
===================================================================
--- /mpich2/trunk/src/mpid/common/datatype/dataloop/dataloop_create_struct.c (revision 3939)
+++ /mpich2/trunk/src/mpid/common/datatype/dataloop/dataloop_create_struct.c (revision 4865)
@@ -372,5 +372,4 @@
 	{
 	    DLOOP_Dataloop *old_loop_ptr;
-	    int old_loop_sz;
 	    DLOOP_Offset old_extent;
 
Index: /mpich2/trunk/src/mpid/ch3/channels/nemesis/nemesis/netmod/tcp/socksm.c
===================================================================
--- /mpich2/trunk/src/mpid/ch3/channels/nemesis/nemesis/netmod/tcp/socksm.c (revision 4707)
+++ /mpich2/trunk/src/mpid/ch3/channels/nemesis/nemesis/netmod/tcp/socksm.c (revision 4865)
@@ -1556,5 +1556,5 @@
 #undef FCNAME
 #define FCNAME MPIDI_QUOTE(FUNCNAME)
-int MPID_nem_tcp_sm_init()
+int MPID_nem_tcp_sm_init(void)
 {
     int mpi_errno = MPI_SUCCESS;
@@ -1601,5 +1601,5 @@
 #undef FCNAME
 #define FCNAME MPIDI_QUOTE(FUNCNAME)
-int MPID_nem_tcp_sm_finalize()
+int MPID_nem_tcp_sm_finalize(void)
 {
     freenode_t *node;
Index: /mpich2/trunk/src/mpid/ch3/channels/nemesis/nemesis/netmod/tcp/tcp_send.c
===================================================================
--- /mpich2/trunk/src/mpid/ch3/channels/nemesis/nemesis/netmod/tcp/tcp_send.c (revision 4511)
+++ /mpich2/trunk/src/mpid/ch3/channels/nemesis/nemesis/netmod/tcp/tcp_send.c (revision 4865)
@@ -49,5 +49,5 @@
 #undef FCNAME
 #define FCNAME MPIDI_QUOTE(FUNCNAME)
-int MPID_nem_tcp_send_init()
+int MPID_nem_tcp_send_init(void)
 {
     int mpi_errno = MPI_SUCCESS;
@@ -187,5 +187,5 @@
 #undef FCNAME
 #define FCNAME MPIDI_QUOTE(FUNCNAME)
-int MPID_nem_tcp_send_finalize()
+int MPID_nem_tcp_send_finalize(void)
 {
     int mpi_errno = MPI_SUCCESS;
Index: /mpich2/trunk/src/mpid/ch3/channels/nemesis/nemesis/netmod/tcp/tcp_finalize.c
===================================================================
--- /mpich2/trunk/src/mpid/ch3/channels/nemesis/nemesis/netmod/tcp/tcp_finalize.c (revision 4415)
+++ /mpich2/trunk/src/mpid/ch3/channels/nemesis/nemesis/netmod/tcp/tcp_finalize.c (revision 4865)
@@ -11,5 +11,5 @@
 #undef FCNAME
 #define FCNAME MPIDI_QUOTE(FUNCNAME)
-int MPID_nem_tcp_finalize()
+int MPID_nem_tcp_finalize(void)
 {
     int mpi_errno = MPI_SUCCESS;
@@ -41,5 +41,5 @@
 #undef FCNAME
 #define FCNAME MPIDI_QUOTE(FUNCNAME)
-int MPID_nem_tcp_ckpt_shutdown()
+int MPID_nem_tcp_ckpt_shutdown(void)
 {
     return MPID_nem_tcp_finalize();
Index: /mpich2/trunk/src/mpid/ch3/channels/nemesis/nemesis/netmod/tcp/tcp_init.c
===================================================================
--- /mpich2/trunk/src/mpid/ch3/channels/nemesis/nemesis/netmod/tcp/tcp_init.c (revision 4707)
+++ /mpich2/trunk/src/mpid/ch3/channels/nemesis/nemesis/netmod/tcp/tcp_init.c (revision 4865)
@@ -232,27 +232,25 @@
         }
     }
-
+    
+    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); */
Index: /mpich2/trunk/src/mpid/ch3/channels/nemesis/nemesis/netmod/tcp/tcp_impl.h
===================================================================
--- /mpich2/trunk/src/mpid/ch3/channels/nemesis/nemesis/netmod/tcp/tcp_impl.h (revision 4530)
+++ /mpich2/trunk/src/mpid/ch3/channels/nemesis/nemesis/netmod/tcp/tcp_impl.h (revision 4865)
@@ -155,5 +155,6 @@
 S*/
 typedef struct MPIDU_Sock_ifaddr_t {
-    int len, type;
+    unsigned int len;
+    int type;
     unsigned char ifaddr[16];
 } MPIDU_Sock_ifaddr_t;
Index: /mpich2/trunk/src/mpid/ch3/channels/nemesis/nemesis/src/mpid_nem_alloc.c
===================================================================
--- /mpich2/trunk/src/mpid/ch3/channels/nemesis/nemesis/src/mpid_nem_alloc.c (revision 4538)
+++ /mpich2/trunk/src/mpid/ch3/channels/nemesis/nemesis/src/mpid_nem_alloc.c (revision 4865)
@@ -448,5 +448,5 @@
 #undef FCNAME
 #define FCNAME MPIDI_QUOTE(FUNCNAME)
-int MPIDI_CH3I_Seg_destroy()
+int MPIDI_CH3I_Seg_destroy(void)
 {
     int mpi_errno = MPI_SUCCESS;
Index: /mpich2/trunk/src/mpid/ch3/channels/nemesis/nemesis/src/mpid_nem_finalize.c
===================================================================
--- /mpich2/trunk/src/mpid/ch3/channels/nemesis/nemesis/src/mpid_nem_finalize.c (revision 4371)
+++ /mpich2/trunk/src/mpid/ch3/channels/nemesis/nemesis/src/mpid_nem_finalize.c (revision 4865)
@@ -15,5 +15,5 @@
 #undef FCNAME
 #define FCNAME MPIDI_QUOTE(FUNCNAME)
-int MPID_nem_finalize()
+int MPID_nem_finalize(void)
 {
     int mpi_errno = MPI_SUCCESS;
@@ -77,5 +77,5 @@
 #undef FCNAME
 #define FCNAME MPIDI_QUOTE(FUNCNAME)
-int MPID_nem_ckpt_shutdown()
+int MPID_nem_ckpt_shutdown(void)
 {
     int mpi_errno = MPI_SUCCESS;
Index: /mpich2/trunk/src/mpid/ch3/channels/nemesis/nemesis/src/mpid_nem_lmt_shm.c
===================================================================
--- /mpich2/trunk/src/mpid/ch3/channels/nemesis/nemesis/src/mpid_nem_lmt_shm.c (revision 4707)
+++ /mpich2/trunk/src/mpid/ch3/channels/nemesis/nemesis/src/mpid_nem_lmt_shm.c (revision 4865)
@@ -760,5 +760,5 @@
 #undef FCNAME
 #define FCNAME MPIDI_QUOTE(FUNCNAME)
-int MPID_nem_lmt_shm_progress()
+int MPID_nem_lmt_shm_progress(void)
 {
     int mpi_errno = MPI_SUCCESS;