minor fixes

This commit was SVN r4528.

src/mca/coll/hierarch/coll_hierarch.c

@@ -176,7 +176,6 @@ mca_coll_hierarch_module_init(struct ompi_communicator_t *comm)
 
     struct ompi_communicator_t *llcomm=NULL;
     struct mca_coll_base_comm_t *data=NULL;
-    struct mca_coll_base_module_1_0_0_t *hier_mod=NULL;
 
     rank = ompi_comm_rank(comm);
     size = ompi_comm_size(comm);
@@ -241,7 +240,6 @@ mca_coll_hierarch_module_init(struct ompi_communicator_t *comm)
 
     memcpy ( data->hier_lleaders, llr, data->hier_num_lleaders * sizeof(int));
     comm->c_coll_selected_data = (struct mca_coll_base_comm_t *)data;
-    hier_mod = &intra;
 
  exit:
     if ( NULL != llr ) {
@@ -261,9 +259,10 @@ mca_coll_hierarch_module_init(struct ompi_communicator_t *comm)
 	    }
 	    free ( data );
 	}
+	return NULL;
     }
 
-    return hier_mod;
+    return &intra;
 }
 
 
@@ -279,6 +278,8 @@ int mca_coll_hierarch_module_finalize(struct ompi_communicator_t *comm)
     llcomm = data->hier_llcomm;
 
     ompi_comm_free (&llcomm);
+    free ( data->hier_reqs);
+    free ( data->hier_lleaders);
     free ( data );
     
     comm->c_coll_selected_data = NULL;

src/mca/coll/hierarch/coll_hierarch_bcast.c

@@ -38,20 +38,3 @@ int mca_coll_hierarch_bcast_intra(void *buff, int count,
   return comm->c_coll_basic_module->coll_bcast(buff, count, datatype,
                                                root, comm);
 }
-
-
-/*
- *	bcast_inter
- *
- *	Function:	- broadcast using O(N) algorithm
- *	Accepts:	- same arguments as MPI_Bcast()
- *	Returns:	- MPI_SUCCESS or error code
- */
-int mca_coll_hierarch_bcast_inter(void *buff, int count,
-                              struct ompi_datatype_t *datatype, int root,
-                              struct ompi_communicator_t *comm)
-{
-  ompi_output_verbose(10, mca_coll_base_output, "In hierarch bcast_inter");
-  return comm->c_coll_basic_module->coll_bcast(buff, count, datatype,
-                                               root, comm);
-}