Remove all useless variables. Minor cleanups.

This commit was SVN r10000.

ompi/mca/bml/bml.h

@@ -146,26 +146,24 @@ static inline mca_bml_base_btl_t* mca_bml_base_btl_array_insert(mca_bml_base_btl
  * @param array (IN)
  * @param btl (IN)
  */
-static inline bool mca_bml_base_btl_array_remove(mca_bml_base_btl_array_t* array, 
-                                                struct mca_btl_base_module_t* btl) { 
-    size_t i=0, index;
-    bool found = false;
+static inline bool mca_bml_base_btl_array_remove( mca_bml_base_btl_array_t* array, 
+                                                  struct mca_btl_base_module_t* btl )
+{ 
+    size_t i = 0;
     /* find the btl */
-    for(i=0; i<array->arr_size; i++) {
-        if(array->bml_btls[i].btl == btl) {
-            found = true;
-        }
-        if(found) { 
-            /* move all btl's back by 1, so the found 
-               btl is "removed" */
-            array->bml_btls[i] = array->bml_btls[(i+1)];
+    for( i = 0; i < array->arr_size; i++ ) {
+        if( array->bml_btls[i].btl == btl ) {
+            for( ; i < array->arr_size; i++ ) {
+                /* move all btl's back by 1, so the found 
+                   btl is "removed" */
+                array->bml_btls[i] = array->bml_btls[(i+1)];
+            }
+            array->arr_size--;
+            array->arr_index = 0;
+            return true;
         }
     }
-    if(found) { 
-        array->arr_size--;
-        array->arr_index = 0;
-    }
-    return found;
+    return false;
 }
 
 

ompi/mca/bml/r2/bml_r2.c

@@ -564,8 +564,6 @@ int mca_bml_r2_del_btl(mca_btl_base_module_t* btl)
 int mca_bml_r2_del_proc_btl(ompi_proc_t* proc, mca_btl_base_module_t* btl)
 {
     mca_bml_base_endpoint_t* ep = (mca_bml_base_endpoint_t*)proc->proc_pml;
-    mca_btl_base_component_progress_fn_t * btl_progress_new; 
-    int i, j;
     double total_bandwidth = 0;
     size_t b;