From 76f47aaa1cc32ec92e3771524983b174d28bb215 Mon Sep 17 00:00:00 2001
From: Brian Barrett <brbarret@open-mpi.org>
Date: Fri, 26 Sep 2008 16:15:05 +0000
Subject: [PATCH] Fix a bunch of compiler warnings.  Refs trac:1458

This commit was SVN r19649.

The following Trac tickets were found above:
  Ticket 1458 --> https://svn.open-mpi.org/trac/ompi/ticket/1458
---
 ompi/mca/btl/portals/btl_portals_component.c  | 2 +-
 ompi/mca/mtl/portals/mtl_portals.c            | 2 --
 ompi/mca/mtl/portals/mtl_portals.h            | 2 +-
 ompi/mca/mtl/portals/mtl_portals_component.c  | 3 ++-
 ompi/mca/mtl/portals/mtl_portals_recv.c       | 2 +-
 ompi/mca/mtl/portals/mtl_portals_send_short.h | 2 +-
 6 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/ompi/mca/btl/portals/btl_portals_component.c b/ompi/mca/btl/portals/btl_portals_component.c
index 4749b64a8a..bc97dcdd3b 100644
--- a/ompi/mca/btl/portals/btl_portals_component.c
+++ b/ompi/mca/btl/portals/btl_portals_component.c
@@ -421,7 +421,7 @@ mca_btl_portals_component_progress(void)
                                              tag
                                              ));
                         
-                        OPAL_OUTPUT_VERBOSE((90, mca_btl_portals_component.portals_output,"received %d bytes \n", ev.mlength));
+                        OPAL_OUTPUT_VERBOSE((90, mca_btl_portals_component.portals_output,"received %d bytes \n", (int) ev.mlength));
                         frag->segments[0].seg_addr.pval = &frag->data;
                         frag->segments[0].seg_len = header_size;
                         if(ev.mlength) {
diff --git a/ompi/mca/mtl/portals/mtl_portals.c b/ompi/mca/mtl/portals/mtl_portals.c
index 3762cdb840..33b1c85411 100644
--- a/ompi/mca/mtl/portals/mtl_portals.c
+++ b/ompi/mca/mtl/portals/mtl_portals.c
@@ -335,8 +335,6 @@ ompi_mtl_portals_progress(void)
     int count = 0, ret;
     ptl_event_t ev;
     ompi_mtl_portals_request_t *ptl_request;
-    int which;
-    ompi_mtl_portals_event_t *unex_recv;
 
     while (true) {
 
diff --git a/ompi/mca/mtl/portals/mtl_portals.h b/ompi/mca/mtl/portals/mtl_portals.h
index cdaf7cbd45..6870f2799b 100644
--- a/ompi/mca/mtl/portals/mtl_portals.h
+++ b/ompi/mca/mtl/portals/mtl_portals.h
@@ -78,7 +78,7 @@ struct mca_mtl_portals_module_t {
     ptl_handle_md_t ptl_short_md_h;
 
     int ptl_num_copy_blocks;
-    int ptl_copy_block_len;
+    ptl_size_t ptl_copy_block_len;
 
     int *ptl_copy_block_free_list;
     int ptl_copy_block_first_free;
diff --git a/ompi/mca/mtl/portals/mtl_portals_component.c b/ompi/mca/mtl/portals/mtl_portals_component.c
index f76ed624e3..7f8888ca43 100644
--- a/ompi/mca/mtl/portals/mtl_portals_component.c
+++ b/ompi/mca/mtl/portals/mtl_portals_component.c
@@ -145,7 +145,8 @@ ompi_mtl_portals_component_open(void)
                            false,
                            false,
                            8192,
-                           &ompi_mtl_portals.ptl_copy_block_len);
+                           &tmp);
+    ompi_mtl_portals.ptl_copy_block_len = tmp;
 
     mca_base_param_reg_int(&mca_mtl_portals_component.mtl_version,
                            "aggressive_polling",
diff --git a/ompi/mca/mtl/portals/mtl_portals_recv.c b/ompi/mca/mtl/portals/mtl_portals_recv.c
index 70f9061364..c8fd82b370 100644
--- a/ompi/mca/mtl/portals/mtl_portals_recv.c
+++ b/ompi/mca/mtl/portals/mtl_portals_recv.c
@@ -175,7 +175,7 @@ ompi_mtl_portals_get_data(ompi_mtl_portals_event_t *recv_event,
         /* see if this message filled the receive block */
         if (recv_event->ev.md.length - (recv_event->ev.offset + 
                                         recv_event->ev.mlength) <
-            recv_event->ev.md.max_size) {
+            (ptl_size_t) recv_event->ev.md.max_size) {
             block->full = true;
         }
 
diff --git a/ompi/mca/mtl/portals/mtl_portals_send_short.h b/ompi/mca/mtl/portals/mtl_portals_send_short.h
index 890d3e4d69..629ee6e5c0 100644
--- a/ompi/mca/mtl/portals/mtl_portals_send_short.h
+++ b/ompi/mca/mtl/portals/mtl_portals_send_short.h
@@ -23,7 +23,7 @@ extern void ompi_mtl_portals_short_setup(void);
 extern void ompi_mtl_portals_short_cleanup(void);
 
 static inline int
-ompi_mtl_portals_alloc_short_buf()
+ompi_mtl_portals_alloc_short_buf(void)
 {
     int buf_num;