Skip to content

mpi4: fix init check for a few more functions #10994

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 1, 2022
Merged

mpi4: fix init check for a few more functions #10994

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions ompi/mpi/c/errhandler_c2f.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
* Copyright (c) 2006-2012 Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2015 Research Organization for Information Science
* and Technology (RIST). All rights reserved.
* Copyright (c) 2022 Triad National Security, LLC. All rights
* reserved.
* $COPYRIGHT$
*
* Additional copyrights may follow
Expand All @@ -33,16 +35,14 @@
#define MPI_Errhandler_c2f PMPI_Errhandler_c2f
#endif

static const char FUNC_NAME[] = "MPI_Errhandler_c2f";
static const char FUNC_NAME[] __opal_attribute_unused__ = "MPI_Errhandler_c2f";


MPI_Fint MPI_Errhandler_c2f(MPI_Errhandler errhandler)
{
/* Error checking */

if (MPI_PARAM_CHECK) {
OMPI_ERR_INIT_FINALIZE(FUNC_NAME);

/* mapping an invalid handle to a null handle */
if (NULL == errhandler) {
return OMPI_INT_2_FINT(-1);
Expand Down
5 changes: 3 additions & 2 deletions ompi/mpi/c/errhandler_free.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
* All rights reserved.
* Copyright (c) 2015 Research Organization for Information Science
* and Technology (RIST). All rights reserved.
* Copyright (c) 2022 Triad National Security, LLC. All rights
* reserved.
* $COPYRIGHT$
*
* Additional copyrights may follow
Expand All @@ -32,15 +34,14 @@
#define MPI_Errhandler_free PMPI_Errhandler_free
#endif

static const char FUNC_NAME[] = "MPI_Errhandler_free";
static const char FUNC_NAME[] __opal_attribute_unused__ = "MPI_Errhandler_free";


int MPI_Errhandler_free(MPI_Errhandler *errhandler)
{
/* Error checking */

if (MPI_PARAM_CHECK) {
OMPI_ERR_INIT_FINALIZE(FUNC_NAME);
/* Raise an MPI exception if we got NULL or if we got an intrinsic
*and* the reference count is 1 (meaning that this FREE would
actually free the underlying intrinsic object). This is ugly
Expand Down
3 changes: 1 addition & 2 deletions ompi/mpi/c/session_call_errhandler.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,15 +36,14 @@
#endif


static const char FUNC_NAME[] = "MPI_Session_call_errhandler";
static const char FUNC_NAME[] __opal_attribute_unused__ = "MPI_Session_call_errhandler";


int MPI_Session_call_errhandler(MPI_Session session, int errorcode)
{
/* Error checking */

if (MPI_PARAM_CHECK) {
OMPI_ERR_INIT_FINALIZE(FUNC_NAME);
if (ompi_instance_invalid(session)) {
if (NULL != session) {
return OMPI_ERRHANDLER_INVOKE(session, MPI_ERR_SESSION, FUNC_NAME);
Expand Down