[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.2-39-gf91f92e

[Service Account]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "MPICH primary repository".

The branch, master has been updated
       via  f91f92e228bd0dee356473bd7c77ada22d6f9149 (commit)
      from  b653dd1903e3d4fdad0552b50441bd5e6d7117d2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.mpich.org/mpich.git/commitdiff/f91f92e228bd0dee356473bd7c77ada22d6f9149

commit f91f92e228bd0dee356473bd7c77ada22d6f9149
Author: Ken Raffenetti <raffenet at mcs.anl.gov>
Date:   Tue Dec 22 09:30:21 2015 -0600

    coll/ibcast: fixups for [da5a5bba6089]
    
    Add explicit return type and fixup misaligned return statement for
    static functions. Squash warning about reaching the end of non-void
    function in MPIR_Ibcast_SMP.
    
    Signed-off-by: Yanfei Guo <yguo at anl.gov>

diff --git a/src/mpi/coll/ibcast.c b/src/mpi/coll/ibcast.c
index f00ec9b..aa13dbd 100644
--- a/src/mpi/coll/ibcast.c
+++ b/src/mpi/coll/ibcast.c
@@ -32,7 +32,7 @@ struct MPIR_Ibcast_status{
 #undef FCNAME
 #define FCNAME MPL_QUOTE(FUNCNAME)
 
-static sched_test_length(MPID_Comm * comm, int tag, void *state)
+static int sched_test_length(MPID_Comm * comm, int tag, void *state)
 {
     int mpi_errno = MPI_SUCCESS;
     int recv_size;
@@ -44,7 +44,7 @@ static sched_test_length(MPID_Comm * comm, int tag, void *state)
                      "**collective_size_mismatch",
 		          "**collective_size_mismatch %d %d", status->n_bytes, recv_size);
     }
-   return mpi_errno;
+    return mpi_errno;
 }
 
 #undef FUNCNAME
@@ -52,7 +52,7 @@ static sched_test_length(MPID_Comm * comm, int tag, void *state)
 #undef FCNAME
 #define FCNAME MPL_QUOTE(FUNCNAME)
 
-static sched_test_curr_length(MPID_Comm * comm, int tag, void *state)
+static int sched_test_curr_length(MPID_Comm * comm, int tag, void *state)
 {
     int mpi_errno = MPI_SUCCESS;
     struct  MPIR_Ibcast_status *status = (struct MPIR_Ibcast_status*) state;
@@ -62,7 +62,7 @@ static sched_test_curr_length(MPID_Comm * comm, int tag, void *state)
                      "**collective_size_mismatch",
 		          "**collective_size_mismatch %d %d", status->n_bytes, status->curr_bytes);
     }
-   return mpi_errno;
+    return mpi_errno;
 }
 
 #undef FUNCNAME
@@ -70,7 +70,7 @@ static sched_test_curr_length(MPID_Comm * comm, int tag, void *state)
 #undef FCNAME
 #define FCNAME MPL_QUOTE(FUNCNAME)
 
-static sched_add_length(MPID_Comm * comm, int tag, void *state)
+static int sched_add_length(MPID_Comm * comm, int tag, void *state)
 {
     int mpi_errno = MPI_SUCCESS;
     int recv_size;
@@ -850,6 +850,7 @@ fn_exit:
     return mpi_errno;
 fn_fail:
     MPIR_SCHED_CHKPMEM_REAP(s);
+    goto fn_exit;
 }
 
 

-----------------------------------------------------------------------

Summary of changes:
 src/mpi/coll/ibcast.c |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
MPICH primary repository