Remove a bunch of dead code: gcc 4.7 warns of set-but-unused

variables.  So get rid of them.

This commit was SVN r28538.

Author: jsquyres

ompi/mca/bcol/base/bcol_base_frame.c

@@ -1,6 +1,7 @@
 /*
  * Copyright (c) 2009-2012 Oak Ridge National Laboratory.  All rights reserved.
  * Copyright (c) 2009-2012 Mellanox Technologies.  All rights reserved.
+ * Copyright (c) 2013 Cisco Systems, Inc.  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -269,10 +270,6 @@ int mca_bcol_base_fn_table_destroy(struct mca_bcol_base_module_t *bcol_module){
     int bcol_fn;
 
     for (bcol_fn = 0; bcol_fn < BCOL_NUM_OF_FUNCTIONS; bcol_fn++){
-        opal_list_t *tmp_list;
-
-        tmp_list = &bcol_module->bcol_fns_table[bcol_fn];
-
         /* gvm FIX: Go through the list and destroy each item */
         /* Destroy the function table object for each bcol type list */
         OBJ_DESTRUCT(&(bcol_module->bcol_fns_table[bcol_fn]));

ompi/mca/bcol/basesmuma/bcol_basesmuma_bcast_prime.c

@@ -1,6 +1,7 @@
 /*
  * Copyright (c) 2009-2012 Oak Ridge National Laboratory.  All rights reserved.
  * Copyright (c) 2009-2012 Mellanox Technologies.  All rights reserved.
+ * Copyright (c) 2013 Cisco Systems, Inc.  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -252,9 +253,6 @@ int bcol_basesmuma_bcast_k_nomial_anyroot(bcol_function_args_t *input_args,
     int count=input_args->count;
     struct ompi_datatype_t* dtype=input_args->dtype;
     int64_t sequence_number=input_args->sequence_num;
-    
-
-    int pow_k_levels;
     int radix = cs->k_nomial_radix;
     int radix_mask;
     int relative_rank;
@@ -264,8 +262,6 @@ int bcol_basesmuma_bcast_k_nomial_anyroot(bcol_function_args_t *input_args,
     int bcol_id = (int) bcol_module->super.bcol_id;
     volatile mca_bcol_basesmuma_payload_t *data_buffs;
     volatile void* parent_data_pointer;
-    volatile void* my_data_pointer;
-    
 
     volatile mca_bcol_basesmuma_header_t *child_ctl_pointer;
     volatile mca_bcol_basesmuma_header_t *my_ctl_pointer;
@@ -294,15 +290,12 @@ int bcol_basesmuma_bcast_k_nomial_anyroot(bcol_function_args_t *input_args,
     idx=SM_ARRAY_INDEX(leading_dim,buff_idx,0);
 
     /* get pow_k_levels and pow_k_group_size */
-    pow_k_levels = bcol_module->pow_k_levels;
     pow_k_group_size = bcol_module->pow_k;
 
 
     data_buffs=(volatile mca_bcol_basesmuma_payload_t *)
         bcol_module->colls_with_user_data.data_buffs+idx;
 
-    my_data_pointer = data_buffs[my_rank].payload;
-
     /* Set pointer to current proc ctrl region */
     my_ctl_pointer = data_buffs[my_rank].ctl_struct; 
 

ompi/mca/bcol/basesmuma/bcol_basesmuma_rd_nb_barrier.c

@@ -1,6 +1,7 @@
 /*
  * Copyright (c) 2009-2010 UT-Battelle, LLC. All rights reserved.
  * Copyright (c) 2009-2010 Mellanox Technologies. All rights reserved.
+ * Copyright (c) 2013 Cisco Systems, Inc.  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -36,7 +37,7 @@ int bcol_basesmuma_rd_nb_barrier_init_admin(
     int pair_rank;
     mca_bcol_basesmuma_ctl_struct_t **ctl_structs;
     netpatterns_pair_exchange_node_t *my_exchange_node;
-    int extra_rank, my_rank, pow_2;
+    int extra_rank, my_rank;
     mca_bcol_basesmuma_ctl_struct_t volatile *partner_ctl;
     mca_bcol_basesmuma_ctl_struct_t volatile *my_ctl;
     int64_t bank_genaration;
@@ -54,7 +55,6 @@ int bcol_basesmuma_rd_nb_barrier_init_admin(
 
 	my_exchange_node=&(bcol_module->recursive_doubling_tree);
     my_rank=bcol_module->super.sbgp_partner_module->my_index;
-    pow_2=bcol_module->super.sbgp_partner_module->pow_2;
     my_ctl=ctl_structs[my_rank];
     /* debug print */
     /*
@@ -206,7 +206,7 @@ int bcol_basesmuma_rd_nb_barrier_progress_admin(
     int pair_rank, start_index, restart_phase;
     mca_bcol_basesmuma_ctl_struct_t **ctl_structs;
     netpatterns_pair_exchange_node_t *my_exchange_node;
-    int extra_rank, my_rank, pow_2;
+    int extra_rank, my_rank;
     mca_bcol_basesmuma_ctl_struct_t volatile *partner_ctl;
     mca_bcol_basesmuma_ctl_struct_t volatile *my_ctl;
     int64_t bank_genaration;
@@ -224,7 +224,6 @@ int bcol_basesmuma_rd_nb_barrier_progress_admin(
 
     my_exchange_node=&(bcol_module->recursive_doubling_tree);
     my_rank=bcol_module->super.sbgp_partner_module->my_index;
-    pow_2=bcol_module->super.sbgp_partner_module->pow_2;
     my_ctl=ctl_structs[my_rank];
 
     /* check to make sure that this should be progressed */

ompi/mca/dpm/base/dpm_base_common_fns.c

@@ -13,7 +13,7 @@
  * Copyright (c) 2006-2007 University of Houston. All rights reserved.
  * Copyright (c) 2006-2007 Los Alamos National Security, LLC.  All rights
  *                         reserved. 
- * Copyright (c) 2007      Cisco Systems, Inc. All rights reserved.
+ * Copyright (c) 2007-2013 Cisco Systems, Inc.  All rights reserved.
  *
  * $COPYRIGHT$
  *
@@ -184,7 +184,6 @@ int ompi_dpm_base_disconnect_waitall (int count, ompi_dpm_base_disconnect_obj **
     char *treq=NULL;
     int totalcount = 0;
     int i;
-    int ret;
 
     for (i=0; i<count; i++) {
         if (NULL == objs[i]) {
@@ -209,7 +208,7 @@ int ompi_dpm_base_disconnect_waitall (int count, ompi_dpm_base_disconnect_obj **
     }
 
     /* force all non-blocking all-to-alls to finish */
-    ret = ompi_request_wait_all (2*totalcount, reqs, MPI_STATUSES_IGNORE);
+    ompi_request_wait_all (2*totalcount, reqs, MPI_STATUSES_IGNORE);
 
     /* Finally, free everything */
     for (i=0; i< count; i++ ) {

opal/class/opal_tree.c

@@ -4,6 +4,7 @@
  * Copyright (c) 2012      The University of Tennessee and The University
  *                         of Tennessee Research Foundation.  All rights
  *                         reserved.
+ * Copyright (c) 2013 Cisco Systems, Inc.  All rights reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
@@ -566,7 +567,6 @@ int opal_tree_copy_subtree(opal_tree_t *from_tree, opal_tree_item_t *from_item,
 
 opal_tree_item_t *opal_tree_dup_item(opal_tree_t *base, opal_tree_item_t *from)
 {
-    int ret;
     opal_buffer_t *buffer = NULL;
     opal_tree_item_t *new_item = NULL;
 
@@ -575,7 +575,7 @@ opal_tree_item_t *opal_tree_dup_item(opal_tree_t *base, opal_tree_item_t *from)
     opal_tree_serialize(from, buffer);
 
     new_item = OBJ_NEW(opal_tree_item_t);
-    ret = opal_tree_deserialize(buffer, new_item);
+    opal_tree_deserialize(buffer, new_item);
 
     OBJ_RELEASE(buffer);
     return new_item;
@@ -670,7 +670,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 *root, *curr_item = item, *result = NULL;
+    opal_tree_item_t *curr_item = item, *result = NULL;
 
     if (!opal_tree_is_empty(item->opal_tree_container)) {
         /* check my descendant for a match */
@@ -684,7 +684,6 @@ 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);

opal/mca/base/mca_base_var.c

@@ -10,7 +10,7 @@
  *                         University of Stuttgart.  All rights reserved.
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
- * Copyright (c) 2008-2011 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2008-2013 Cisco Systems, Inc.  All rights reserved.
  * Copyright (c) 2012-2013 Los Alamos National Security, LLC. All rights
  *                         reserved.
  * $COPYRIGHT$
@@ -2008,7 +2008,7 @@ int mca_base_var_group_get_stamp (void)
 
 int mca_base_var_dump(int index, char ***out, mca_base_var_dump_type_t output_type)
 {
-    const char *project, *framework, *component, *full_name;
+    const char *framework, *component, *full_name;
     int i, line_count, line = 0, enum_count = 0;
     char *value_string, *source_string, *tmp;
     const mca_base_var_storage_t *value;
@@ -2039,7 +2039,6 @@ int mca_base_var_dump(int index, char ***out, mca_base_var_dump_type_t output_ty
         return ret;
     }
 
-    project   = group->group_project;
     framework = group->group_framework;
     component = group->group_component ? group->group_component : "base";
     full_name = var->mbv_full_name;

opal/mca/base/mca_base_var_enum.c

@@ -10,7 +10,7 @@
  *                         University of Stuttgart.  All rights reserved.
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
- * Copyright (c) 2008-2011 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2008-2013 Cisco Systems, Inc.  All rights reserved.
  * Copyright (c) 2012-2013 Los Alamos National Security, LLC. All rights
  *                         reserved.
  * $COPYRIGHT$
@@ -63,7 +63,7 @@ int mca_base_var_enum_create (char *name, mca_base_var_enum_value_t *values, mca
 
 static int enum_dump (mca_base_var_enum_t *self, char **out)
 {
-    size_t len, i;
+    size_t i;
     char *tmp;
     int ret;
 
@@ -74,7 +74,7 @@ static int enum_dump (mca_base_var_enum_t *self, char **out)
     }
 
     tmp = NULL;
-    for (i = 0, len = 0 ; self->enum_values[i].string ; ++i) {
+    for (i = 0; self->enum_values[i].string ; ++i) {
         ret = asprintf (out, "%s%s%d:\"%s\"", tmp ? tmp : "", tmp ? ", " : "", self->enum_values[i].value,
                         self->enum_values[i].string);
         if (tmp) free (tmp);

opal/runtime/opal_cr.c

@@ -12,7 +12,7 @@
  * Copyright (c) 2007-2013 Los Alamos National Security, LLC.  All rights
  *                         reserved. 
  * Copyright (c) 2011      Oak Ridge National Labs.  All rights reserved.
- * Copyright (c) 2012 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2012-2013 Cisco Systems, Inc.  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -917,7 +917,6 @@ int opal_cr_reg_coord_callback(opal_cr_coord_callback_fn_t  new_func,
 }
 
 int opal_cr_refresh_environ(int prev_pid) {
-    int val;
     char *file_name = NULL;
 #if OPAL_ENABLE_CRDEBUG == 1
     char *tmp;
@@ -957,8 +956,6 @@ int opal_cr_refresh_environ(int prev_pid) {
     opal_output_verbose(10, opal_cr_output,
                         "opal_cr: init: C/R Debugging Enabled [%s] (refresh)\n",
                         (MPIR_debug_with_checkpoint ? "True": "False"));
-#else
-    val = 0; /* Silence Compiler warning */
 #endif
 
     if( NULL != file_name ){

opal/util/if.c

@@ -309,9 +309,7 @@ int16_t opal_ifaddrtokindex(const char* if_addr)
 
             if (AF_INET == r->ai_family) {
                 struct sockaddr_in ipv4;
-                struct sockaddr_in *inaddr;
 
-                inaddr = (struct sockaddr_in*) &intf->if_addr;
                 memcpy (&ipv4, r->ai_addr, r->ai_addrlen);
                 if (opal_net_samenetwork((struct sockaddr*)&ipv4, (struct sockaddr*)&intf->if_addr, intf->if_mask)) {
                     return intf->if_kernel_index;

orte/mca/dfs/orted/dfs_orted.c

@@ -1,6 +1,7 @@
 /*
  * Copyright (c) 2012-2013 Los Alamos National Security, LLC.
  *                         All rights reserved.
+ * Copyright (c) 2013 Cisco Systems, Inc.  All rights reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
@@ -1285,7 +1286,7 @@ static void recv_dfs_cmd(int status, orte_process_name_t* sender,
     orte_dfs_cmd_t cmd;
     int32_t cnt;
     opal_list_item_t *item;
-    int remote_fd, my_fd;
+    int my_fd;
     int32_t rc, nmaps;
     char *filename;
     orte_dfs_tracker_t *trk;
@@ -1581,7 +1582,6 @@ static void recv_dfs_cmd(int status, orte_process_name_t* sender,
 
     case ORTE_DFS_READ_CMD:
         /* set default error */
-        remote_fd = -1;
         my_fd = -1;
         bytes_read = -1;
         read_buf = NULL;