Remove unused variables.

This commit was SVN r26966.
2012-08-08 12:43:13 +00:00 · 2012-08-08 12:43:13 +00:00 · f7528bb404
--- a/opal/class/opal_graph.c
+++ b/opal/class/opal_graph.c
@ -2,7 +2,7 @@
 * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
 *                         University Research and Technology
 *                         Corporation.  All rights reserved.
- * Copyright (c) 2004-2006 The University of Tennessee and The University
+ * Copyright (c) 2004-2012 The University of Tennessee and The University
 *                         of Tennessee Research Foundation.  All rights
 *                         reserved.
 * Copyright (c) 2004-2007 High Performance Computing Center Stuttgart, 
@ -278,7 +278,7 @@ void opal_graph_add_vertex(opal_graph_t *graph, opal_graph_vertex_t *vertex)
 */
 int opal_graph_add_edge(opal_graph_t *graph, opal_graph_edge_t *edge) 
 {
-    opal_adjacency_list_t *aj_list, *start_aj_list= NULL;
+    opal_adjacency_list_t *aj_list, *start_aj_list= NULL, *end_aj_list;
    opal_list_item_t *item;
    bool start_found = false, end_found = false;

@ -296,6 +296,7 @@ int opal_graph_add_edge(opal_graph_t *graph, opal_graph_edge_t *edge)
        }
        if (aj_list->vertex == edge->end) {
            end_found = true;
+            end_aj_list = aj_list;
        }
    }
    /**
--- a/opal/class/opal_tree.c
+++ b/opal/class/opal_tree.c
@ -1,5 +1,8 @@
 /*
 * Copyright (c) 2011      Oracle and/or its affiliates.  All rights reserved.
+ * Copyright (c) 2012      The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
 * $COPYRIGHT$
 * 
 * Additional copyrights may follow
@ -445,7 +448,7 @@ static opal_tree_item_t *find_in_descendants(opal_tree_item_t* item, void *key)
 */
 opal_tree_item_t *opal_tree_find_with(opal_tree_item_t *item, void *key)
 {
-    opal_tree_item_t *curr_item = item, *result = NULL;
+    opal_tree_item_t *root, *curr_item = item, *result = NULL;
    
    if (!opal_tree_is_empty(item->opal_tree_container)) {
        /* check my descendant for a match */
@ -459,6 +462,7 @@ opal_tree_item_t *opal_tree_find_with(opal_tree_item_t *item, void *key)
        }
            
        /* check my ancestors (uncles) for match */
+        root = opal_tree_get_root(item->opal_tree_container);
        curr_item = item;
        while (!result && curr_item && curr_item->opal_tree_num_ancestors > 0){
            curr_item = opal_tree_get_next_sibling(item->opal_tree_parent);
--- a/opal/datatype/opal_datatype_copy.c
+++ b/opal/datatype/opal_datatype_copy.c
@ -3,7 +3,7 @@
 * Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana
 *                         University Research and Technology
 *                         Corporation.  All rights reserved.
- * Copyright (c) 2004-2010 The University of Tennessee and The University
+ * Copyright (c) 2004-2012 The University of Tennessee and The University
 *                         of Tennessee Research Foundation.  All rights
 *                         reserved.
 * Copyright (c) 2004-2006 High Performance Computing Center Stuttgart,
@ -101,6 +101,7 @@ int32_t opal_datatype_copy_content_same_ddt( const opal_datatype_t* datatype, in
                                             char* destination_base, char* source_base )
 {
    OPAL_PTRDIFF_TYPE extent;
+    size_t iov_len_local;
    int32_t (*fct)( const opal_datatype_t*, int32_t, char*, char*);

 #if OPAL_CUDA_SUPPORT
@ -115,6 +116,7 @@ int32_t opal_datatype_copy_content_same_ddt( const opal_datatype_t* datatype, in
     */
    if( 0 == count ) return 1;

+    iov_len_local = count * datatype->size;
    /**
     * see discussion in coll_basic_reduce.c for the computation of extent when
     * count != 1. Short version of the story:
--- a/opal/mca/base/mca_base_components_open.c
+++ b/opal/mca/base/mca_base_components_open.c
@ -2,7 +2,7 @@
 * Copyright (c) 2004-2008 The Trustees of Indiana University and Indiana
 *                         University Research and Technology
 *                         Corporation.  All rights reserved.
- * Copyright (c) 2004-2007 The University of Tennessee and The University
+ * Copyright (c) 2004-2012 The University of Tennessee and The University
 *                         of Tennessee Research Foundation.  All rights
 *                         reserved.
 * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
@ -389,6 +389,10 @@ static int open_components(const char *type_name, int output_id,
            ret = component->mca_register_component_params();
            if (MCA_SUCCESS == ret) {
                registered = true;
+                opal_output_verbose(10, output_id, 
+                                    "mca: base: components_open: "
+                                    "component %s register function successful",
+                                    component->mca_component_name);
            } else if (OPAL_ERR_NOT_AVAILABLE != ret) {
                /* If the component returns OPAL_ERR_NOT_AVAILABLE,
                   it's a cue to "silently ignore me" -- it's not a
@ -407,12 +411,11 @@ static int open_components(const char *type_name, int output_id,
                                component->mca_type_name,
                                component->mca_component_name);
                }
-            }
                opal_output_verbose(10, output_id, 
                                    "mca: base: components_open: "
-                                "component %s register function %s",
-                                component->mca_component_name,
-                                (true == registered ? "successful": "failed"));
+                                    "component %s register function failed",
+                                    component->mca_component_name);
+            }
        }

        if (NULL == component->mca_open_component) {
--- a/opal/mca/base/mca_base_param.c
+++ b/opal/mca/base/mca_base_param.c
@ -2,7 +2,7 @@
 * Copyright (c) 2004-2008 The Trustees of Indiana University and Indiana
 *                         University Research and Technology
 *                         Corporation.  All rights reserved.
- * Copyright (c) 2004-2008 The University of Tennessee and The University
+ * Copyright (c) 2004-2012 The University of Tennessee and The University
 *                         of Tennessee Research Foundation.  All rights
 *                         reserved.
 * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
@ -178,6 +178,7 @@ int mca_base_param_init(void)

 int mca_base_param_recache_files(bool rel_path_search)
 {
+    int id;
    char *files, *new_files = NULL, *new_agg_files = NULL;
    char * new_agg_path = NULL, *agg_default_path = NULL;

@ -205,7 +206,7 @@ int mca_base_param_recache_files(bool rel_path_search)
    /* Initialize a parameter that says where MCA param files can
       be found */

-    mca_base_param_reg_string_name("mca", "param_files",
+    id = mca_base_param_reg_string_name("mca", "param_files",
                                        "Path for MCA configuration files containing default parameter values",
                                        false, false, files, &new_files);

@ -213,18 +214,18 @@ int mca_base_param_recache_files(bool rel_path_search)
     * A prefix search path to look up aggregate MCA parameter file
     * requests that do not specify an absolute path
     */
-    mca_base_param_reg_string_name("mca", "base_param_file_prefix",
+    id = mca_base_param_reg_string_name("mca", "base_param_file_prefix",
                                        "Aggregate MCA parameter file sets",
                                        false, false, NULL, &new_agg_files);
    
    asprintf(&agg_default_path,
             "%s"OPAL_PATH_SEP"amca-param-sets%c%s",
             opal_install_dirs.pkgdatadir, OPAL_ENV_SEP, cwd);
-    mca_base_param_reg_string_name("mca", "base_param_file_path",
+    id = mca_base_param_reg_string_name("mca", "base_param_file_path",
                                        "Aggregate MCA parameter Search path",
                                        false, false, agg_default_path, &new_agg_path);

-    mca_base_param_reg_string_name("mca", "base_param_file_path_force",
+    id = mca_base_param_reg_string_name("mca", "base_param_file_path_force",
                                        "Forced Aggregate MCA parameter Search path",
                                        false, false, NULL, &force_agg_path);

--- a/opal/runtime/opal_cr.c
+++ b/opal/runtime/opal_cr.c
@ -2,7 +2,7 @@
 * Copyright (c) 2004-2010 The Trustees of Indiana University and Indiana
 *                         University Research and Technology
 *                         Corporation.  All rights reserved.
- * Copyright (c) 2004-2005 The University of Tennessee and The University
+ * Copyright (c) 2004-2012 The University of Tennessee and The University
 *                         of Tennessee Research Foundation.  All rights
 *                         reserved.
 * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
@ -375,7 +375,7 @@ int opal_cr_init(void )
    }
 #else
    /* Silence a compiler warning */
-    (void)t;
+    t = 0;
 #endif

    mca_base_param_reg_string_name("opal_cr", "tmp_dir",
@ -928,7 +928,7 @@ int opal_cr_refresh_environ(int prev_pid) {
                        "opal_cr: init: C/R Debugging Enabled [%s] (refresh)\n",
                        (MPIR_debug_with_checkpoint ? "True": "False"));
 #else
-    (void)val; /* Silence Compiler warning */
+    val = 0; /* Silence Compiler warning */
 #endif

    if( NULL != file_name ){
--- a/opal/util/printf.c
+++ b/opal/util/printf.c
@ -2,7 +2,7 @@
 * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
 *                         University Research and Technology
 *                         Corporation.  All rights reserved.
- * Copyright (c) 2004-2006 The University of Tennessee and The University
+ * Copyright (c) 2004-2012 The University of Tennessee and The University
 *                         of Tennessee Research Foundation.  All rights
 *                         reserved.
 * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
@ -40,7 +40,7 @@
 */
 static int guess_strlen(const char *fmt, va_list ap)
 {
-    char *sarg;
+    char *sarg, carg;
    double darg;
    float farg;
    size_t i;
@ -58,7 +58,7 @@ static int guess_strlen(const char *fmt, va_list ap)
            ++i;
            switch (fmt[i]) {
            case 'c':
-                (void)va_arg(ap, int);
+                carg = va_arg(ap, int);
                len += 1;  /* let's suppose it's a printable char */
                break;
            case 's':