From 3669e8921e3fde5e9d4c08d7057b092a80d58a81 Mon Sep 17 00:00:00 2001
From: Rainer Keller <rainer.keller@hlrs.de>
Date: Tue, 30 Jan 2007 06:34:38 +0000
Subject: [PATCH]  - Fix further compiler warnings regarding initialization   
 and shadowing variables.

This commit was SVN r13358.
---
 ompi/mca/bml/base/bml_base_init.c | 8 ++++++--
 ompi/mca/pml/base/pml_base_open.c | 9 ++++++---
 opal/class/opal_list.h            | 4 ++--
 opal/threads/mutex.h              | 1 +
 orte/mca/iof/proxy/iof_proxy.c    | 3 ++-
 orte/tools/console/orteconsole.c  | 1 +
 6 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/ompi/mca/bml/base/bml_base_init.c b/ompi/mca/bml/base/bml_base_init.c
index b5b7ee63ee..609a2c7845 100644
--- a/ompi/mca/bml/base/bml_base_init.c
+++ b/ompi/mca/bml/base/bml_base_init.c
@@ -5,7 +5,7 @@
  * Copyright (c) 2004-2006 The University of Tennessee and The University
  *                         of Tennessee Research Foundation.  All rights
  *                         reserved.
- * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
+ * Copyright (c) 2004-2007 High Performance Computing Center Stuttgart, 
  *                         University of Stuttgart.  All rights reserved.
  * Copyright (c) 2004-2006 The Regents of the University of California.
  *                         All rights reserved.
@@ -32,9 +32,13 @@ mca_bml_base_module_t mca_bml = {
     0,                       /* bml_max_rdma_size */ 
     NULL,                    /* bml_add_procs */ 
     NULL,                    /* bml_del_procs */
+    NULL,                    /* bml_add_btl */
+    NULL,                    /* bml_del_btl */
+    NULL,                    /* bml_del_proc_btl */
     NULL,                    /* bml_register */ 
+    NULL,                    /* bml_register_error */ 
     NULL,                    /* bml_finalize*/
-    NULL                    /* bml_progress */
+    NULL                     /* bml_progress */
 };
 mca_bml_base_component_t mca_bml_component;
 
diff --git a/ompi/mca/pml/base/pml_base_open.c b/ompi/mca/pml/base/pml_base_open.c
index 69e137ee52..fff004adbf 100644
--- a/ompi/mca/pml/base/pml_base_open.c
+++ b/ompi/mca/pml/base/pml_base_open.c
@@ -5,7 +5,7 @@
  * Copyright (c) 2004-2006 The University of Tennessee and The University
  *                         of Tennessee Research Foundation.  All rights
  *                         reserved.
- * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
+ * Copyright (c) 2004-2007 High Performance Computing Center Stuttgart, 
  *                         University of Stuttgart.  All rights reserved.
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
@@ -49,7 +49,7 @@ int mca_pml_base_output = 0;
 mca_pml_base_module_t mca_pml = {
     NULL,                    /* pml_add_procs */
     NULL,                    /* pml_del_procs */
-    NULL,                    /* pml_control */
+    NULL,                    /* pml_enable */
     mca_pml_base_progress,   /* pml_progress */
     NULL,                    /* pml_add_comm */
     NULL,                    /* pml_del_comm */
@@ -61,7 +61,10 @@ mca_pml_base_module_t mca_pml = {
     NULL,                    /* pml_send */
     NULL,                    /* pml_iprobe */
     NULL,                    /* pml_probe */
-    NULL                     /* pml_start */
+    NULL,                    /* pml_start */
+    NULL,                    /* pml_dump */
+    0,                       /* pml_max_contextid */
+    0                        /* pml_max_tag */
 };
 
 opal_list_t mca_pml_base_components_available;
diff --git a/opal/class/opal_list.h b/opal/class/opal_list.h
index eba053f29c..83fa57ba68 100644
--- a/opal/class/opal_list.h
+++ b/opal/class/opal_list.h
@@ -411,7 +411,7 @@ _opal_list_append(l,i)
 
 static inline void _opal_list_append(opal_list_t *list, opal_list_item_t *item
 #if OMPI_ENABLE_DEBUG
-                                     , char* FILE, int LINENO
+                                     , char* FILE_NAME, int LINENO
 #endif  /* OMPI_ENABLE_DEBUG */
                                      )
 {
@@ -421,7 +421,7 @@ static inline void _opal_list_append(opal_list_t *list, opal_list_item_t *item
 
   assert(0 == item->opal_list_item_refcount);
   assert( NULL == item->opal_list_item_belong_to );
-  item->super.cls_init_file_name = FILE;
+  item->super.cls_init_file_name = FILE_NAME;
   item->super.cls_init_lineno    = LINENO;
 #endif
 
diff --git a/opal/threads/mutex.h b/opal/threads/mutex.h
index 594bd6ecac..1fb2d7045e 100644
--- a/opal/threads/mutex.h
+++ b/opal/threads/mutex.h
@@ -159,6 +159,7 @@ static inline bool opal_set_using_threads(bool have)
 #if OMPI_HAVE_THREAD_SUPPORT
     opal_uses_threads = have;
 #else
+    have = have;               /* just shut up the compiler */
     opal_uses_threads = false;
 #endif
     return opal_uses_threads;
diff --git a/orte/mca/iof/proxy/iof_proxy.c b/orte/mca/iof/proxy/iof_proxy.c
index 5d27ea1eac..c7ef77826a 100644
--- a/orte/mca/iof/proxy/iof_proxy.c
+++ b/orte/mca/iof/proxy/iof_proxy.c
@@ -44,7 +44,8 @@ orte_iof_base_module_t orte_iof_proxy_module = {
     orte_iof_proxy_pull,
     orte_iof_proxy_subscribe,
     orte_iof_proxy_unsubscribe,
-    orte_iof_base_flush
+    orte_iof_base_flush,
+    NULL
 };
 
 
diff --git a/orte/tools/console/orteconsole.c b/orte/tools/console/orteconsole.c
index 24ed5bf375..e356ea2b2a 100644
--- a/orte/tools/console/orteconsole.c
+++ b/orte/tools/console/orteconsole.c
@@ -252,6 +252,7 @@ orte_console_command_t console_commands[] = {
 
     /* End of list */
     { NULL, NULL, 0, ORTE_CONSOLE_TYPE_NULL,
+      NULL,
       NULL,
       NULL }
 };