[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.2b1-4-g2be371d

[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  2be371d5dc9b744ae623fe18946c4721bb4d5658 (commit)
      from  2e4af0c162877e1d4e3e314e49efe9491b568237 (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/2be371d5dc9b744ae623fe18946c4721bb4d5658

commit 2be371d5dc9b744ae623fe18946c4721bb4d5658
Author: Ken Raffenetti <raffenet at mcs.anl.gov>
Date:   Thu Mar 12 16:59:01 2015 -0500

    move error checking inside guards in info_get.c
    
    Commit [7dfe2840] broke builds with error checking disabled. We fix this
    by moving the guards to ensure the fn_exit and fn_fail labels are always
    present and only the error checking code is preprocessed out.
    
    Fixes #2225
    
    Signed-off-by: Rajeev Thakur <thakur at mcs.anl.gov>

diff --git a/src/mpi/info/info_get.c b/src/mpi/info/info_get.c
index cae3f46..b5bbef6 100644
--- a/src/mpi/info/info_get.c
+++ b/src/mpi/info/info_get.c
@@ -150,16 +150,14 @@ int MPI_Info_get(MPI_Info info, const char *key, int valuelen, char *value,
     /* ... end of body of routine ... */
     if (mpi_errno) goto fn_fail;
 
-#ifdef HAVE_ERROR_CHECKING
   fn_exit:
-#endif
     MPID_MPI_FUNC_EXIT(MPID_STATE_MPI_INFO_GET);
     MPIU_THREAD_CS_EXIT(ALLFUNC,);
     return mpi_errno;
 
     /* --BEGIN ERROR HANDLING-- */
-#   ifdef HAVE_ERROR_CHECKING
   fn_fail:
+#   ifdef HAVE_ERROR_CHECKING
     {
 	mpi_errno = MPIR_Err_create_code( mpi_errno, MPIR_ERR_RECOVERABLE,
 	    FCNAME, __LINE__, MPI_ERR_OTHER, 
@@ -167,7 +165,7 @@ int MPI_Info_get(MPI_Info info, const char *key, int valuelen, char *value,
 	    "**mpi_info_get %I %s %d %p %p", info, key, valuelen, value, flag);
     }
     mpi_errno = MPIR_Err_return_comm( NULL, FCNAME, mpi_errno );
-    goto fn_exit;
 #   endif
+    goto fn_exit;
     /* --END ERROR HANDLING-- */
 }

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

Summary of changes:
 src/mpi/info/info_get.c |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
MPICH primary repository