ompi-abiinfo.patch from dalcinl

Signed-off-by: Howard Pritchard <[email protected]>

Author: hppritcha

ompi/mpi/c/abi_get_info.c.in

@@ -20,19 +20,16 @@
 
 PROTOTYPE ERROR_CLASS abi_get_info(INFO_OUT info)
 {
-    int ret = OMPI_SUCCESS;
-
-#if OMPI_ABI_SRC
+    int ret = OPAL_SUCCESS;
     ompi_info_t *newinfo = NULL;
     char tmp[16];
+
     newinfo = ompi_info_allocate();
     if (NULL == newinfo) {
         return OMPI_ERRHANDLER_NOHANDLE_INVOKE(MPI_ERR_NO_MEM,
                                       "MPI_Info_dup");
     }
 
-    /* TODO: need to set aint_size, count_size, offset_size */
-   
     snprintf(tmp, 16, "%" PRIsize_t, sizeof(MPI_Aint));
     ret = opal_info_set(&newinfo->super, "mpi_aint_size", tmp);
     if (OPAL_SUCCESS != ret) {
@@ -50,12 +47,11 @@ PROTOTYPE ERROR_CLASS abi_get_info(INFO_OUT info)
     }
 
     *info = newinfo;
+
+exit:
+    OMPI_ERRHANDLER_NOHANDLE_RETURN( ret, ret, FUNC_NAME );
+
 err_cleanup:
     ompi_info_free(&newinfo);
-    return ret;
-
-#else
-    *info = MPI_INFO_NULL;
-#endif
-    return ret;
+    goto exit;
 }