Commit 3bed9df3 authored by Pavan Balaji's avatar Pavan Balaji
Browse files

[svn-r9775] Partial warning squash with the intel compiler.

parent 230f02b4
......@@ -644,16 +644,12 @@ int MPIR_Allreduce_inter (
MPIU_ERR_ADD(mpi_errno_ret, mpi_errno);
}
fn_exit:
if (mpi_errno_ret)
mpi_errno = mpi_errno_ret;
else if (*errflag)
MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**coll_fail");
return mpi_errno;
fn_fail:
goto fn_exit;
}
/* MPIR_Allreduce performs an allreduce using point-to-point messages.
......
......@@ -644,7 +644,6 @@ int MPIR_Alltoall_inter(
}
}
fn_exit:
/* check if multiple threads are calling this collective function */
MPIDU_ERR_CHECK_MULTIPLE_THREADS_EXIT( comm_ptr );
if (mpi_errno_ret)
......@@ -653,8 +652,6 @@ int MPIR_Alltoall_inter(
MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**coll_fail");
return mpi_errno;
fn_fail:
goto fn_exit;
}
......
......@@ -324,7 +324,6 @@ int MPIR_Alltoallv_inter (
}
}
fn_exit:
/* check if multiple threads are calling this collective function */
MPIDU_ERR_CHECK_MULTIPLE_THREADS_EXIT( comm_ptr );
if (mpi_errno_ret)
......@@ -332,8 +331,6 @@ int MPIR_Alltoallv_inter (
else if (*errflag)
MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**coll_fail");
return mpi_errno;
fn_fail:
goto fn_exit;
}
......
......@@ -320,7 +320,6 @@ int MPIR_Alltoallw_inter (
}
}
fn_exit:
/* check if multiple threads are calling this collective function */
MPIDU_ERR_CHECK_MULTIPLE_THREADS_EXIT( comm_ptr );
if (mpi_errno_ret)
......@@ -328,8 +327,6 @@ int MPIR_Alltoallw_inter (
else if (*errflag)
MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**coll_fail");
return mpi_errno;
fn_fail:
goto fn_exit;
}
#undef FUNCNAME
......
......@@ -93,8 +93,6 @@ int MPIR_Barrier_intra( MPID_Comm *comm_ptr, int *errflag )
else if (*errflag)
MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**coll_fail");
return mpi_errno;
fn_fail:
goto fn_exit;
}
/* A simple utility function to that calls the comm_ptr->coll_fns->Barrier
......
......@@ -29,7 +29,4 @@ int MPIR_Barrier_group( MPID_Comm *comm_ptr, MPID_Group *group_ptr, int tag, int
fn_exit:
return mpi_errno;
fn_fail:
goto fn_exit;
}
......@@ -342,14 +342,11 @@ static int scatter_for_bcast(
mask >>= 1;
}
fn_exit:
if (mpi_errno_ret)
mpi_errno = mpi_errno_ret;
else if (*errflag)
MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**coll_fail");
return mpi_errno;
fn_fail:
goto fn_exit;
}
/*
......@@ -1032,14 +1029,11 @@ static int MPIR_SMP_Bcast(
}
}
fn_exit:
if (mpi_errno_ret)
mpi_errno = mpi_errno_ret;
else if (*errflag)
MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**coll_fail");
return mpi_errno;
fn_fail:
goto fn_exit;
}
......@@ -1195,8 +1189,6 @@ fn_exit:
else if (*errflag)
MPIU_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**coll_fail");
return mpi_errno;
fn_fail:
goto fn_exit;
}
......@@ -1283,7 +1275,6 @@ int MPIR_Bcast_inter (
}
}
fn_fail:
MPID_MPI_FUNC_EXIT(MPID_STATE_MPIR_BCAST_INTER);
if (mpi_errno_ret)
mpi_errno = mpi_errno_ret;
......
......@@ -589,11 +589,8 @@ int MPIC_Send_ft(void *buf, int count, MPI_Datatype datatype, int dest, int tag,
else
mpi_errno = MPIC_Send(buf, count, datatype, dest, tag, comm);
fn_exit:
MPIDI_FUNC_EXIT(MPID_STATE_MPIC_SEND_FT);
return mpi_errno;
fn_fail:
goto fn_exit;
}
#undef FUNCNAME
......@@ -660,11 +657,8 @@ int MPIC_Ssend_ft(void *buf, int count, MPI_Datatype datatype, int dest, int tag
else
mpi_errno = MPIC_Ssend(buf, count, datatype, dest, tag, comm);
fn_exit:
MPIDI_FUNC_EXIT(MPID_STATE_MPIC_SSEND_FT);
return mpi_errno;
fn_fail:
goto fn_exit;
}
#undef FUNCNAME
......@@ -800,11 +794,8 @@ int MPIC_Isend_ft(void *buf, int count, MPI_Datatype datatype, int dest, int tag
else
mpi_errno = MPIC_Isend(buf, count, datatype, dest, tag, comm, request);
fn_exit:
MPIDI_FUNC_EXIT(MPID_STATE_MPIC_ISEND_FT);
return mpi_errno;
fn_fail:
goto fn_exit;
}
#undef FUNCNAME
......@@ -824,11 +815,8 @@ int MPIC_Irecv_ft(void *buf, int count, MPI_Datatype datatype, int source,
else
mpi_errno = MPIC_Irecv(buf, count, datatype, source, tag, comm, request);
fn_exit:
MPIDI_FUNC_EXIT(MPID_STATE_MPIC_IRECV_FT);
return mpi_errno;
fn_fail:
goto fn_exit;
}
......
......@@ -105,8 +105,6 @@ int MPIR_Reduce_local_impl(void *inbuf, void *inoutbuf, int count, MPI_Datatype
fn_exit:
return mpi_errno;
fn_fail:
goto fn_exit;
}
#endif
......
......@@ -105,7 +105,6 @@ int MPIR_Comm_init(MPID_Comm *comm_p)
/* Fields not set include context_id, remote and local size, and
kind, since different communicator construction routines need
different values */
fn_fail:
return mpi_errno;
}
......@@ -1642,7 +1641,6 @@ int MPIR_Comm_copy_data(MPID_Comm *comm_ptr, MPID_Comm **outcomm_ptr)
*outcomm_ptr = newcomm_ptr;
fn_fail:
fn_exit:
MPID_MPI_FUNC_EXIT(MPID_STATE_MPIR_COMM_COPY_DATA);
return mpi_errno;
}
......
......@@ -73,8 +73,6 @@ int MPIR_Group_compare_impl(MPID_Group *group_ptr1, MPID_Group *group_ptr2, int
fn_exit:
return mpi_errno;
fn_fail:
goto fn_exit;
}
#endif
......
......@@ -97,10 +97,7 @@ int MPIR_Group_translate_ranks_impl(MPID_Group *gp1, int n, int *ranks1,
}
}
}
fn_exit:
return mpi_errno;
fn_fail:
goto fn_exit;
}
......
......@@ -469,7 +469,6 @@ int MPIR_Init_thread(int * argc, char ***argv, int required, int * provided)
if (mpi_errno == MPI_SUCCESS)
mpi_errno = MPID_InitCompleted();
fn_exit:
MPIU_THREAD_CS_EXIT(INIT,required);
return mpi_errno;
......
......@@ -39,8 +39,7 @@ int MPIR_Progress_wait_request(MPID_Request *req)
}
MPID_Progress_end(&progress_state);
}
fn_fail: /* no special err handling at this level */
fn_exit:
fn_fail:
return mpi_errno;
}
......
......@@ -168,7 +168,7 @@ MPI_Info PMPI_Info_f2c(MPI_Fint info);
char *strdup(const char *s);
# endif
#if defined(HAVE_READLINK) && defined(NEEDS_READLINK_DECL) && !defined(readlink)
int readlink(const char *path, char *buf, size_t bufsiz);
ssize_t readlink(const char *path, char *buf, size_t bufsiz);
# endif
#if defined(HAVE_LSTAT) && defined(NEEDS_LSTAT_DECL) && !defined(lstat)
int lstat(const char *file_name, struct stat *buf);
......
......@@ -34,10 +34,7 @@ int MPIR_T_category_changed_impl(int *stamp)
/* TODO implement this function */
fn_exit:
return mpi_errno;
fn_fail:
goto fn_exit;
}
#endif /* MPICH_MPI_FROM_PMPI */
......
......@@ -34,10 +34,7 @@ int MPIR_T_category_get_categories_impl(int cat_index, int len, int indices[])
/* TODO implement this function */
fn_exit:
return mpi_errno;
fn_fail:
goto fn_exit;
}
#endif /* MPICH_MPI_FROM_PMPI */
......
......@@ -34,10 +34,7 @@ int MPIR_T_category_get_cvars_impl(int cat_index, int len, int indices[])
/* TODO implement this function */
fn_exit:
return mpi_errno;
fn_fail:
goto fn_exit;
}
#endif /* MPICH_MPI_FROM_PMPI */
......
......@@ -34,10 +34,7 @@ int MPIR_T_category_get_info_impl(int cat_index, char *name, int *name_len, char
/* TODO implement this function */
fn_exit:
return mpi_errno;
fn_fail:
goto fn_exit;
}
#endif /* MPICH_MPI_FROM_PMPI */
......
......@@ -34,10 +34,7 @@ int MPIR_T_category_get_num_impl(int *num_cat)
/* TODO implement this function */
fn_exit:
return mpi_errno;
fn_fail:
goto fn_exit;
}
#endif /* MPICH_MPI_FROM_PMPI */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment