From ce7935c8fa5a2d844084a9f30470fdeb743c8e19 Mon Sep 17 00:00:00 2001 From: George Bosilca Date: Tue, 4 Oct 2011 14:56:34 +0000 Subject: [PATCH] Obviously these were not needed. This commit was SVN r25231. --- ompi/mca/coll/sm2/coll_sm2.h | 3 +-- ompi/mca/fbtl/base/fbtl_base_file_select.c | 3 +-- ompi/mca/fbtl/base/fbtl_base_find_available.c | 3 +-- ompi/mca/fbtl/base/fbtl_base_open.c | 6 +----- ompi/mca/fbtl/posix/fbtl_posix_ipreadv.c | 3 +-- ompi/mca/fbtl/posix/fbtl_posix_ipwritev.c | 4 +--- ompi/mca/fbtl/posix/fbtl_posix_preadv.c | 4 +--- ompi/mca/fbtl/posix/fbtl_posix_pwritev.c | 3 +-- ompi/mca/fbtl/pvfs2/fbtl_pvfs2_ipreadv.c | 3 +-- ompi/mca/fbtl/pvfs2/fbtl_pvfs2_ipwritev.c | 3 +-- ompi/mca/fbtl/pvfs2/fbtl_pvfs2_preadv.c | 3 +-- ompi/mca/fbtl/pvfs2/fbtl_pvfs2_pwritev.c | 3 +-- ompi/mca/fcache/base/fcache_base_file_select.c | 3 +-- ompi/mca/fcache/base/fcache_base_find_available.c | 3 +-- ompi/mca/fcache/base/fcache_base_open.c | 6 +----- ompi/mca/fcache/ux/fcache_ux_get_file_layout.c | 3 +-- ompi/mca/fcache/ux/fcache_ux_get_io_servers.c | 3 +-- ompi/mca/fcache/ux/fcache_ux_set_file_layout.c | 3 +-- ompi/mca/fcoll/base/fcoll_base_file_select.c | 4 +--- ompi/mca/fcoll/base/fcoll_base_find_available.c | 3 +-- ompi/mca/fcoll/base/fcoll_base_open.c | 6 +----- ompi/mca/fs/base/fs_base_file_select.c | 4 +--- ompi/mca/fs/base/fs_base_find_available.c | 3 +-- ompi/mca/fs/base/fs_base_get_parent_dir.c | 5 +---- ompi/mca/fs/base/fs_base_open.c | 5 +---- ompi/mca/fs/lustre/fs_lustre_file_close.c | 3 +-- ompi/mca/fs/lustre/fs_lustre_file_delete.c | 3 +-- ompi/mca/fs/lustre/fs_lustre_file_get_size.c | 3 +-- ompi/mca/fs/lustre/fs_lustre_file_open.c | 3 +-- ompi/mca/fs/lustre/fs_lustre_file_set_info.c | 3 +-- ompi/mca/fs/lustre/fs_lustre_file_set_size.c | 3 +-- ompi/mca/fs/lustre/fs_lustre_file_sync.c | 3 +-- ompi/mca/fs/pvfs2/fs_pvfs2_file_close.c | 3 +-- ompi/mca/fs/pvfs2/fs_pvfs2_file_delete.c | 3 +-- ompi/mca/fs/pvfs2/fs_pvfs2_file_get_size.c | 3 +-- ompi/mca/fs/pvfs2/fs_pvfs2_file_open.c | 3 +-- ompi/mca/fs/pvfs2/fs_pvfs2_file_set_info.c | 3 +-- ompi/mca/fs/pvfs2/fs_pvfs2_file_set_size.c | 3 +-- ompi/mca/fs/pvfs2/fs_pvfs2_file_sync.c | 3 +-- ompi/mca/fs/ufs/fs_ufs_file_close.c | 3 +-- ompi/mca/fs/ufs/fs_ufs_file_delete.c | 3 +-- ompi/mca/fs/ufs/fs_ufs_file_get_size.c | 3 +-- ompi/mca/fs/ufs/fs_ufs_file_open.c | 3 +-- ompi/mca/fs/ufs/fs_ufs_file_set_info.c | 3 +-- ompi/mca/fs/ufs/fs_ufs_file_set_size.c | 3 +-- ompi/mca/fs/ufs/fs_ufs_file_sync.c | 3 +-- ompi/mca/sharedfp/base/sharedfp_base_file_select.c | 4 +--- ompi/mca/sharedfp/base/sharedfp_base_find_available.c | 3 +-- ompi/mca/sharedfp/base/sharedfp_base_open.c | 5 +---- ompi/mca/sharedfp/dummy/sharedfp_dummy_seek.c | 3 +-- ompi/mca/sharedfp/dummy/sharedfp_dummy_update.c | 3 +-- 51 files changed, 51 insertions(+), 122 deletions(-) diff --git a/ompi/mca/coll/sm2/coll_sm2.h b/ompi/mca/coll/sm2/coll_sm2.h index 4943800ee4..94a23d9da2 100644 --- a/ompi/mca/coll/sm2/coll_sm2.h +++ b/ompi/mca/coll/sm2/coll_sm2.h @@ -2,7 +2,7 @@ * Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana * University Research and Technology * Corporation. All rights reserved. - * Copyright (c) 2004-2006 The University of Tennessee and The University + * Copyright (c) 2004-2011 The University of Tennessee and The University * of Tennessee Research Foundation. All rights * reserved. * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, @@ -25,7 +25,6 @@ #include "mpi.h" #include "opal/mca/mca.h" -/*#include "orte/mca/ns/ns_types.h" */ #include "ompi/mca/coll/coll.h" #include "ompi/mca/common/sm/common_sm_mmap.h" #include "ompi/request/request.h" diff --git a/ompi/mca/fbtl/base/fbtl_base_file_select.c b/ompi/mca/fbtl/base/fbtl_base_file_select.c index c864f259dc..47974ea7d7 100644 --- a/ompi/mca/fbtl/base/fbtl_base_file_select.c +++ b/ompi/mca/fbtl/base/fbtl_base_file_select.c @@ -2,7 +2,7 @@ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana * University Research and Technology * Corporation. All rights reserved. - * Copyright (c) 2004-2005 The University of Tennessee and The University + * Copyright (c) 2004-2011 The University of Tennessee and The University * of Tennessee Research Foundation. All rights * reserved. * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, @@ -25,7 +25,6 @@ #include "opal/util/argv.h" #include "opal/mca/mca.h" #include "opal/mca/base/base.h" -#include "orte/util/show_help.h" #include "ompi/mca/fbtl/fbtl.h" #include "ompi/mca/fbtl/base/base.h" #include "ompi/mca/io/ompio/io_ompio.h" diff --git a/ompi/mca/fbtl/base/fbtl_base_find_available.c b/ompi/mca/fbtl/base/fbtl_base_find_available.c index fbdec3b98f..16926a70cd 100644 --- a/ompi/mca/fbtl/base/fbtl_base_find_available.c +++ b/ompi/mca/fbtl/base/fbtl_base_find_available.c @@ -2,7 +2,7 @@ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana * University Research and Technology * Corporation. All rights reserved. - * Copyright (c) 2004-2005 The University of Tennessee and The University + * Copyright (c) 2004-2011 The University of Tennessee and The University * of Tennessee Research Foundation. All rights * reserved. * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, @@ -25,7 +25,6 @@ #include "mpi.h" #include "ompi/constants.h" #include "opal/class/opal_list.h" -#include "orte/util/show_help.h" #include "opal/mca/mca.h" #include "opal/mca/base/base.h" #include "opal/mca/base/mca_base_component_repository.h" diff --git a/ompi/mca/fbtl/base/fbtl_base_open.c b/ompi/mca/fbtl/base/fbtl_base_open.c index 198ba455d2..a6e8a8e95d 100644 --- a/ompi/mca/fbtl/base/fbtl_base_open.c +++ b/ompi/mca/fbtl/base/fbtl_base_open.c @@ -2,7 +2,7 @@ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana * University Research and Technology * Corporation. All rights reserved. - * Copyright (c) 2004-2005 The University of Tennessee and The University + * Copyright (c) 2004-2011 The University of Tennessee and The University * of Tennessee Research Foundation. All rights * reserved. * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, @@ -22,17 +22,13 @@ #include #include "ompi/class/ompi_free_list.h" -#include "orte/util/show_help.h" #include "opal/mca/mca.h" #include "opal/mca/base/base.h" #include "opal/mca/base/mca_base_param.h" -#include "orte/util/show_help.h" - #include "ompi/mca/fbtl/fbtl.h" #include "ompi/mca/fbtl/base/base.h" - /* * The following file was created by configure. It contains extern * statements and the definition of an array of pointers to each diff --git a/ompi/mca/fbtl/posix/fbtl_posix_ipreadv.c b/ompi/mca/fbtl/posix/fbtl_posix_ipreadv.c index af39955380..2ed913a121 100644 --- a/ompi/mca/fbtl/posix/fbtl_posix_ipreadv.c +++ b/ompi/mca/fbtl/posix/fbtl_posix_ipreadv.c @@ -2,7 +2,7 @@ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana * University Research and Technology * Corporation. All rights reserved. - * Copyright (c) 2004-2005 The University of Tennessee and The University + * Copyright (c) 2004-2011 The University of Tennessee and The University * of Tennessee Research Foundation. All rights * reserved. * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, @@ -23,7 +23,6 @@ #include "mpi.h" #include "ompi/constants.h" -#include "orte/util/show_help.h" #include "ompi/mca/fbtl/fbtl.h" size_t diff --git a/ompi/mca/fbtl/posix/fbtl_posix_ipwritev.c b/ompi/mca/fbtl/posix/fbtl_posix_ipwritev.c index fbd2732995..5f5fe22208 100644 --- a/ompi/mca/fbtl/posix/fbtl_posix_ipwritev.c +++ b/ompi/mca/fbtl/posix/fbtl_posix_ipwritev.c @@ -2,7 +2,7 @@ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana * University Research and Technology * Corporation. All rights reserved. - * Copyright (c) 2004-2005 The University of Tennessee and The University + * Copyright (c) 2004-2011 The University of Tennessee and The University * of Tennessee Research Foundation. All rights * reserved. * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, @@ -17,7 +17,6 @@ * $HEADER$ */ - #include "ompi_config.h" #include "fbtl_posix.h" @@ -26,7 +25,6 @@ #include #include #include "ompi/constants.h" -#include "orte/util/show_help.h" #include "ompi/mca/fbtl/fbtl.h" size_t diff --git a/ompi/mca/fbtl/posix/fbtl_posix_preadv.c b/ompi/mca/fbtl/posix/fbtl_posix_preadv.c index f137cfb433..c2c4f7fcae 100644 --- a/ompi/mca/fbtl/posix/fbtl_posix_preadv.c +++ b/ompi/mca/fbtl/posix/fbtl_posix_preadv.c @@ -2,7 +2,7 @@ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana * University Research and Technology * Corporation. All rights reserved. - * Copyright (c) 2004-2005 The University of Tennessee and The University + * Copyright (c) 2004-2011 The University of Tennessee and The University * of Tennessee Research Foundation. All rights * reserved. * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, @@ -17,14 +17,12 @@ * $HEADER$ */ - #include "ompi_config.h" #include "fbtl_posix.h" #include "mpi.h" #include #include "ompi/constants.h" -#include "orte/util/show_help.h" #include "ompi/mca/fbtl/fbtl.h" size_t diff --git a/ompi/mca/fbtl/posix/fbtl_posix_pwritev.c b/ompi/mca/fbtl/posix/fbtl_posix_pwritev.c index d1069ccbdc..ad12bdd8c9 100644 --- a/ompi/mca/fbtl/posix/fbtl_posix_pwritev.c +++ b/ompi/mca/fbtl/posix/fbtl_posix_pwritev.c @@ -2,7 +2,7 @@ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana * University Research and Technology * Corporation. All rights reserved. - * Copyright (c) 2004-2005 The University of Tennessee and The University + * Copyright (c) 2004-2011 The University of Tennessee and The University * of Tennessee Research Foundation. All rights * reserved. * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, @@ -25,7 +25,6 @@ #include #include #include "ompi/constants.h" -#include "orte/util/show_help.h" #include "ompi/mca/fbtl/fbtl.h" size_t diff --git a/ompi/mca/fbtl/pvfs2/fbtl_pvfs2_ipreadv.c b/ompi/mca/fbtl/pvfs2/fbtl_pvfs2_ipreadv.c index 29015059b8..fc289e4cf5 100644 --- a/ompi/mca/fbtl/pvfs2/fbtl_pvfs2_ipreadv.c +++ b/ompi/mca/fbtl/pvfs2/fbtl_pvfs2_ipreadv.c @@ -2,7 +2,7 @@ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana * University Research and Technology * Corporation. All rights reserved. - * Copyright (c) 2004-2005 The University of Tennessee and The University + * Copyright (c) 2004-2011 The University of Tennessee and The University * of Tennessee Research Foundation. All rights * reserved. * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, @@ -23,7 +23,6 @@ #include "mpi.h" #include "ompi/constants.h" -#include "orte/util/show_help.h" #include "ompi/mca/fbtl/fbtl.h" size_t diff --git a/ompi/mca/fbtl/pvfs2/fbtl_pvfs2_ipwritev.c b/ompi/mca/fbtl/pvfs2/fbtl_pvfs2_ipwritev.c index b7224e8d0b..64f9008311 100644 --- a/ompi/mca/fbtl/pvfs2/fbtl_pvfs2_ipwritev.c +++ b/ompi/mca/fbtl/pvfs2/fbtl_pvfs2_ipwritev.c @@ -2,7 +2,7 @@ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana * University Research and Technology * Corporation. All rights reserved. - * Copyright (c) 2004-2005 The University of Tennessee and The University + * Copyright (c) 2004-2011 The University of Tennessee and The University * of Tennessee Research Foundation. All rights * reserved. * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, @@ -23,7 +23,6 @@ #include "mpi.h" #include "ompi/constants.h" -#include "orte/util/show_help.h" #include "ompi/mca/fbtl/fbtl.h" size_t diff --git a/ompi/mca/fbtl/pvfs2/fbtl_pvfs2_preadv.c b/ompi/mca/fbtl/pvfs2/fbtl_pvfs2_preadv.c index e6555a833c..f0fe61d04a 100644 --- a/ompi/mca/fbtl/pvfs2/fbtl_pvfs2_preadv.c +++ b/ompi/mca/fbtl/pvfs2/fbtl_pvfs2_preadv.c @@ -2,7 +2,7 @@ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana * University Research and Technology * Corporation. All rights reserved. - * Copyright (c) 2004-2005 The University of Tennessee and The University + * Copyright (c) 2004-2011 The University of Tennessee and The University * of Tennessee Research Foundation. All rights * reserved. * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, @@ -28,7 +28,6 @@ #include "mpi.h" #include #include "ompi/constants.h" -#include "orte/util/show_help.h" #include "ompi/mca/fbtl/fbtl.h" size_t diff --git a/ompi/mca/fbtl/pvfs2/fbtl_pvfs2_pwritev.c b/ompi/mca/fbtl/pvfs2/fbtl_pvfs2_pwritev.c index 99ecd5209f..f28372a2f0 100644 --- a/ompi/mca/fbtl/pvfs2/fbtl_pvfs2_pwritev.c +++ b/ompi/mca/fbtl/pvfs2/fbtl_pvfs2_pwritev.c @@ -2,7 +2,7 @@ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana * University Research and Technology * Corporation. All rights reserved. - * Copyright (c) 2004-2005 The University of Tennessee and The University + * Copyright (c) 2004-2011 The University of Tennessee and The University * of Tennessee Research Foundation. All rights * reserved. * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, @@ -29,7 +29,6 @@ #include #include #include "ompi/constants.h" -#include "orte/util/show_help.h" #include "ompi/mca/fbtl/fbtl.h" size_t diff --git a/ompi/mca/fcache/base/fcache_base_file_select.c b/ompi/mca/fcache/base/fcache_base_file_select.c index 6f50d96aab..d3b199a275 100644 --- a/ompi/mca/fcache/base/fcache_base_file_select.c +++ b/ompi/mca/fcache/base/fcache_base_file_select.c @@ -2,7 +2,7 @@ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana * University Research and Technology * Corporation. All rights reserved. - * Copyright (c) 2004-2005 The University of Tennessee and The University + * Copyright (c) 2004-2011 The University of Tennessee and The University * of Tennessee Research Foundation. All rights * reserved. * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, @@ -25,7 +25,6 @@ #include "opal/util/argv.h" #include "opal/mca/mca.h" #include "opal/mca/base/base.h" -#include "orte/util/show_help.h" #include "ompi/mca/fcache/fcache.h" #include "ompi/mca/fcache/base/base.h" #include "ompi/mca/io/ompio/io_ompio.h" diff --git a/ompi/mca/fcache/base/fcache_base_find_available.c b/ompi/mca/fcache/base/fcache_base_find_available.c index fdb5ff112e..fd2ce0c48b 100644 --- a/ompi/mca/fcache/base/fcache_base_find_available.c +++ b/ompi/mca/fcache/base/fcache_base_find_available.c @@ -2,7 +2,7 @@ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana * University Research and Technology * Corporation. All rights reserved. - * Copyright (c) 2004-2005 The University of Tennessee and The University + * Copyright (c) 2004-2011 The University of Tennessee and The University * of Tennessee Research Foundation. All rights * reserved. * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, @@ -25,7 +25,6 @@ #include "mpi.h" #include "ompi/constants.h" #include "opal/class/opal_list.h" -#include "orte/util/show_help.h" #include "opal/mca/mca.h" #include "opal/mca/base/base.h" #include "opal/mca/base/mca_base_component_repository.h" diff --git a/ompi/mca/fcache/base/fcache_base_open.c b/ompi/mca/fcache/base/fcache_base_open.c index 259003e3ab..241ec73c70 100644 --- a/ompi/mca/fcache/base/fcache_base_open.c +++ b/ompi/mca/fcache/base/fcache_base_open.c @@ -2,7 +2,7 @@ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana * University Research and Technology * Corporation. All rights reserved. - * Copyright (c) 2004-2005 The University of Tennessee and The University + * Copyright (c) 2004-2011 The University of Tennessee and The University * of Tennessee Research Foundation. All rights * reserved. * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, @@ -22,17 +22,13 @@ #include #include "ompi/class/ompi_free_list.h" -#include "orte/util/show_help.h" #include "opal/mca/mca.h" #include "opal/mca/base/base.h" #include "opal/mca/base/mca_base_param.h" -#include "orte/util/show_help.h" - #include "ompi/mca/fcache/fcache.h" #include "ompi/mca/fcache/base/base.h" - /* * The following file was created by configure. It contains extern * statements and the definition of an array of pointers to each diff --git a/ompi/mca/fcache/ux/fcache_ux_get_file_layout.c b/ompi/mca/fcache/ux/fcache_ux_get_file_layout.c index 9ae20876a6..942da00853 100644 --- a/ompi/mca/fcache/ux/fcache_ux_get_file_layout.c +++ b/ompi/mca/fcache/ux/fcache_ux_get_file_layout.c @@ -2,7 +2,7 @@ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana * University Research and Technology * Corporation. All rights reserved. - * Copyright (c) 2004-2005 The University of Tennessee and The University + * Copyright (c) 2004-2011 The University of Tennessee and The University * of Tennessee Research Foundation. All rights * reserved. * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, @@ -23,7 +23,6 @@ #include "mpi.h" #include "ompi/constants.h" -#include "orte/util/show_help.h" #include "ompi/mca/fcache/fcache.h" int diff --git a/ompi/mca/fcache/ux/fcache_ux_get_io_servers.c b/ompi/mca/fcache/ux/fcache_ux_get_io_servers.c index 3f9930534c..cfd9102173 100644 --- a/ompi/mca/fcache/ux/fcache_ux_get_io_servers.c +++ b/ompi/mca/fcache/ux/fcache_ux_get_io_servers.c @@ -2,7 +2,7 @@ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana * University Research and Technology * Corporation. All rights reserved. - * Copyright (c) 2004-2005 The University of Tennessee and The University + * Copyright (c) 2004-2011 The University of Tennessee and The University * of Tennessee Research Foundation. All rights * reserved. * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, @@ -23,7 +23,6 @@ #include "mpi.h" #include "ompi/constants.h" -#include "orte/util/show_help.h" #include "ompi/mca/fcache/fcache.h" int diff --git a/ompi/mca/fcache/ux/fcache_ux_set_file_layout.c b/ompi/mca/fcache/ux/fcache_ux_set_file_layout.c index 006c6d4074..4520e3552c 100644 --- a/ompi/mca/fcache/ux/fcache_ux_set_file_layout.c +++ b/ompi/mca/fcache/ux/fcache_ux_set_file_layout.c @@ -2,7 +2,7 @@ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana * University Research and Technology * Corporation. All rights reserved. - * Copyright (c) 2004-2005 The University of Tennessee and The University + * Copyright (c) 2004-2011 The University of Tennessee and The University * of Tennessee Research Foundation. All rights * reserved. * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, @@ -23,7 +23,6 @@ #include "mpi.h" #include "ompi/constants.h" -#include "orte/util/show_help.h" #include "ompi/mca/fcache/fcache.h" int diff --git a/ompi/mca/fcoll/base/fcoll_base_file_select.c b/ompi/mca/fcoll/base/fcoll_base_file_select.c index e964ac4881..d55c7db79f 100644 --- a/ompi/mca/fcoll/base/fcoll_base_file_select.c +++ b/ompi/mca/fcoll/base/fcoll_base_file_select.c @@ -2,7 +2,7 @@ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana * University Research and Technology * Corporation. All rights reserved. - * Copyright (c) 2004-2005 The University of Tennessee and The University + * Copyright (c) 2004-2011 The University of Tennessee and The University * of Tennessee Research Foundation. All rights * reserved. * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, @@ -25,7 +25,6 @@ #include "opal/util/argv.h" #include "opal/mca/mca.h" #include "opal/mca/base/base.h" -#include "orte/util/show_help.h" #include "ompi/mca/fcoll/fcoll.h" #include "ompi/mca/fcoll/base/base.h" #include "ompi/mca/io/ompio/io_ompio.h" @@ -299,7 +298,6 @@ int mca_fcoll_base_file_select (struct mca_io_ompio_file_t *file, /* * This typically means that there was no component which was * able to run properly this time. So, we need to abort - * JMS replace with show_help */ OBJ_DESTRUCT(&queried); return OMPI_ERROR; diff --git a/ompi/mca/fcoll/base/fcoll_base_find_available.c b/ompi/mca/fcoll/base/fcoll_base_find_available.c index f9aed720c0..eba0c1bdc6 100644 --- a/ompi/mca/fcoll/base/fcoll_base_find_available.c +++ b/ompi/mca/fcoll/base/fcoll_base_find_available.c @@ -2,7 +2,7 @@ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana * University Research and Technology * Corporation. All rights reserved. - * Copyright (c) 2004-2005 The University of Tennessee and The University + * Copyright (c) 2004-2011 The University of Tennessee and The University * of Tennessee Research Foundation. All rights * reserved. * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, @@ -25,7 +25,6 @@ #include "mpi.h" #include "ompi/constants.h" #include "opal/class/opal_list.h" -#include "orte/util/show_help.h" #include "opal/mca/mca.h" #include "opal/mca/base/base.h" #include "opal/mca/base/mca_base_component_repository.h" diff --git a/ompi/mca/fcoll/base/fcoll_base_open.c b/ompi/mca/fcoll/base/fcoll_base_open.c index 384c1c74c2..5c5ff75786 100644 --- a/ompi/mca/fcoll/base/fcoll_base_open.c +++ b/ompi/mca/fcoll/base/fcoll_base_open.c @@ -2,7 +2,7 @@ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana * University Research and Technology * Corporation. All rights reserved. - * Copyright (c) 2004-2005 The University of Tennessee and The University + * Copyright (c) 2004-2011 The University of Tennessee and The University * of Tennessee Research Foundation. All rights * reserved. * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, @@ -22,17 +22,13 @@ #include #include "ompi/class/ompi_free_list.h" -#include "orte/util/show_help.h" #include "opal/mca/mca.h" #include "opal/mca/base/base.h" #include "opal/mca/base/mca_base_param.h" -#include "orte/util/show_help.h" - #include "ompi/mca/fcoll/fcoll.h" #include "ompi/mca/fcoll/base/base.h" - /* * The following file was created by configure. It contains extern * statements and the definition of an array of pointers to each diff --git a/ompi/mca/fs/base/fs_base_file_select.c b/ompi/mca/fs/base/fs_base_file_select.c index 1c6719e20b..ec8b5d0f45 100644 --- a/ompi/mca/fs/base/fs_base_file_select.c +++ b/ompi/mca/fs/base/fs_base_file_select.c @@ -2,7 +2,7 @@ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana * University Research and Technology * Corporation. All rights reserved. - * Copyright (c) 2004-2005 The University of Tennessee and The University + * Copyright (c) 2004-2011 The University of Tennessee and The University * of Tennessee Research Foundation. All rights * reserved. * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, @@ -25,7 +25,6 @@ #include "opal/util/argv.h" #include "opal/mca/mca.h" #include "opal/mca/base/base.h" -#include "orte/util/show_help.h" #include "ompi/mca/fs/fs.h" #include "ompi/mca/fs/base/base.h" #include "ompi/mca/io/ompio/io_ompio.h" @@ -292,7 +291,6 @@ int mca_fs_base_file_select (struct mca_io_ompio_file_t *file, /* * This typically means that there was no component which was * able to run properly this time. So, we need to abort - * JMS replace with show_help */ OBJ_DESTRUCT(&queried); return OMPI_ERROR; diff --git a/ompi/mca/fs/base/fs_base_find_available.c b/ompi/mca/fs/base/fs_base_find_available.c index 6bfa2829d4..63a3818753 100644 --- a/ompi/mca/fs/base/fs_base_find_available.c +++ b/ompi/mca/fs/base/fs_base_find_available.c @@ -2,7 +2,7 @@ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana * University Research and Technology * Corporation. All rights reserved. - * Copyright (c) 2004-2005 The University of Tennessee and The University + * Copyright (c) 2004-2011 The University of Tennessee and The University * of Tennessee Research Foundation. All rights * reserved. * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, @@ -25,7 +25,6 @@ #include "mpi.h" #include "ompi/constants.h" #include "opal/class/opal_list.h" -#include "orte/util/show_help.h" #include "opal/mca/mca.h" #include "opal/mca/base/base.h" #include "opal/mca/base/mca_base_component_repository.h" diff --git a/ompi/mca/fs/base/fs_base_get_parent_dir.c b/ompi/mca/fs/base/fs_base_get_parent_dir.c index d064075fa4..0ce9f50411 100644 --- a/ompi/mca/fs/base/fs_base_get_parent_dir.c +++ b/ompi/mca/fs/base/fs_base_get_parent_dir.c @@ -2,7 +2,7 @@ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana * University Research and Technology * Corporation. All rights reserved. - * Copyright (c) 2004-2005 The University of Tennessee and The University + * Copyright (c) 2004-2011 The University of Tennessee and The University * of Tennessee Research Foundation. All rights * reserved. * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, @@ -22,13 +22,10 @@ #include #include "ompi/class/ompi_free_list.h" -#include "orte/util/show_help.h" #include "opal/mca/mca.h" #include "opal/mca/base/base.h" #include "opal/mca/base/mca_base_param.h" -#include "orte/util/show_help.h" - #include "ompi/mca/fs/fs.h" #include "ompi/mca/fs/base/base.h" diff --git a/ompi/mca/fs/base/fs_base_open.c b/ompi/mca/fs/base/fs_base_open.c index c2250d9b8c..d73fe35594 100644 --- a/ompi/mca/fs/base/fs_base_open.c +++ b/ompi/mca/fs/base/fs_base_open.c @@ -2,7 +2,7 @@ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana * University Research and Technology * Corporation. All rights reserved. - * Copyright (c) 2004-2005 The University of Tennessee and The University + * Copyright (c) 2004-2011 The University of Tennessee and The University * of Tennessee Research Foundation. All rights * reserved. * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, @@ -22,13 +22,10 @@ #include #include "ompi/class/ompi_free_list.h" -#include "orte/util/show_help.h" #include "opal/mca/mca.h" #include "opal/mca/base/base.h" #include "opal/mca/base/mca_base_param.h" -#include "orte/util/show_help.h" - #include "ompi/mca/fs/fs.h" #include "ompi/mca/fs/base/base.h" diff --git a/ompi/mca/fs/lustre/fs_lustre_file_close.c b/ompi/mca/fs/lustre/fs_lustre_file_close.c index 1816379ba9..0ee1e15b27 100644 --- a/ompi/mca/fs/lustre/fs_lustre_file_close.c +++ b/ompi/mca/fs/lustre/fs_lustre_file_close.c @@ -2,7 +2,7 @@ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana * University Research and Technology * Corporation. All rights reserved. - * Copyright (c) 2004-2005 The University of Tennessee and The University + * Copyright (c) 2004-2011 The University of Tennessee and The University * of Tennessee Research Foundation. All rights * reserved. * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, @@ -25,7 +25,6 @@ #include #include "mpi.h" #include "ompi/constants.h" -#include "orte/util/show_help.h" #include "ompi/mca/fs/fs.h" /* diff --git a/ompi/mca/fs/lustre/fs_lustre_file_delete.c b/ompi/mca/fs/lustre/fs_lustre_file_delete.c index 0bc59e6963..ba45ae168d 100644 --- a/ompi/mca/fs/lustre/fs_lustre_file_delete.c +++ b/ompi/mca/fs/lustre/fs_lustre_file_delete.c @@ -2,7 +2,7 @@ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana * University Research and Technology * Corporation. All rights reserved. - * Copyright (c) 2004-2005 The University of Tennessee and The University + * Copyright (c) 2004-2011 The University of Tennessee and The University * of Tennessee Research Foundation. All rights * reserved. * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, @@ -24,7 +24,6 @@ #include "mpi.h" #include "ompi/constants.h" -#include "orte/util/show_help.h" #include "ompi/mca/fs/fs.h" /* diff --git a/ompi/mca/fs/lustre/fs_lustre_file_get_size.c b/ompi/mca/fs/lustre/fs_lustre_file_get_size.c index 544a87706e..35c73cf40c 100644 --- a/ompi/mca/fs/lustre/fs_lustre_file_get_size.c +++ b/ompi/mca/fs/lustre/fs_lustre_file_get_size.c @@ -2,7 +2,7 @@ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana * University Research and Technology * Corporation. All rights reserved. - * Copyright (c) 2004-2005 The University of Tennessee and The University + * Copyright (c) 2004-2011 The University of Tennessee and The University * of Tennessee Research Foundation. All rights * reserved. * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, @@ -23,7 +23,6 @@ #include "mpi.h" #include "ompi/constants.h" -#include "orte/util/show_help.h" #include "ompi/mca/fs/fs.h" /* diff --git a/ompi/mca/fs/lustre/fs_lustre_file_open.c b/ompi/mca/fs/lustre/fs_lustre_file_open.c index a69a25088f..8fa41f7d86 100644 --- a/ompi/mca/fs/lustre/fs_lustre_file_open.c +++ b/ompi/mca/fs/lustre/fs_lustre_file_open.c @@ -2,7 +2,7 @@ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana * University Research and Technology * Corporation. All rights reserved. - * Copyright (c) 2004-2005 The University of Tennessee and The University + * Copyright (c) 2004-2011 The University of Tennessee and The University * of Tennessee Research Foundation. All rights * reserved. * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, @@ -25,7 +25,6 @@ #include #include "mpi.h" #include "ompi/constants.h" -#include "orte/util/show_help.h" #include "ompi/mca/fs/fs.h" #include "ompi/communicator/communicator.h" #include "ompi/info/info.h" diff --git a/ompi/mca/fs/lustre/fs_lustre_file_set_info.c b/ompi/mca/fs/lustre/fs_lustre_file_set_info.c index 5830e77f03..88246c7e4b 100644 --- a/ompi/mca/fs/lustre/fs_lustre_file_set_info.c +++ b/ompi/mca/fs/lustre/fs_lustre_file_set_info.c @@ -2,7 +2,7 @@ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana * University Research and Technology * Corporation. All rights reserved. - * Copyright (c) 2004-2005 The University of Tennessee and The University + * Copyright (c) 2004-2011 The University of Tennessee and The University * of Tennessee Research Foundation. All rights * reserved. * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, @@ -23,7 +23,6 @@ #include "mpi.h" #include "ompi/constants.h" -#include "orte/util/show_help.h" #include "ompi/mca/fs/fs.h" /* diff --git a/ompi/mca/fs/lustre/fs_lustre_file_set_size.c b/ompi/mca/fs/lustre/fs_lustre_file_set_size.c index 942fffd922..c5492a31eb 100644 --- a/ompi/mca/fs/lustre/fs_lustre_file_set_size.c +++ b/ompi/mca/fs/lustre/fs_lustre_file_set_size.c @@ -2,7 +2,7 @@ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana * University Research and Technology * Corporation. All rights reserved. - * Copyright (c) 2004-2005 The University of Tennessee and The University + * Copyright (c) 2004-2011 The University of Tennessee and The University * of Tennessee Research Foundation. All rights * reserved. * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, @@ -23,7 +23,6 @@ #include "mpi.h" #include "ompi/constants.h" -#include "orte/util/show_help.h" #include "ompi/mca/fs/fs.h" /* diff --git a/ompi/mca/fs/lustre/fs_lustre_file_sync.c b/ompi/mca/fs/lustre/fs_lustre_file_sync.c index 577d1a4306..2c97f8e90d 100644 --- a/ompi/mca/fs/lustre/fs_lustre_file_sync.c +++ b/ompi/mca/fs/lustre/fs_lustre_file_sync.c @@ -2,7 +2,7 @@ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana * University Research and Technology * Corporation. All rights reserved. - * Copyright (c) 2004-2005 The University of Tennessee and The University + * Copyright (c) 2004-2011 The University of Tennessee and The University * of Tennessee Research Foundation. All rights * reserved. * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, @@ -24,7 +24,6 @@ #include "mpi.h" #include "ompi/constants.h" -#include "orte/util/show_help.h" #include "ompi/mca/fs/fs.h" /* diff --git a/ompi/mca/fs/pvfs2/fs_pvfs2_file_close.c b/ompi/mca/fs/pvfs2/fs_pvfs2_file_close.c index 42ef1a6e95..675cd1766a 100644 --- a/ompi/mca/fs/pvfs2/fs_pvfs2_file_close.c +++ b/ompi/mca/fs/pvfs2/fs_pvfs2_file_close.c @@ -2,7 +2,7 @@ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana * University Research and Technology * Corporation. All rights reserved. - * Copyright (c) 2004-2005 The University of Tennessee and The University + * Copyright (c) 2004-2011 The University of Tennessee and The University * of Tennessee Research Foundation. All rights * reserved. * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, @@ -29,7 +29,6 @@ #include #include "mpi.h" #include "ompi/constants.h" -#include "orte/util/show_help.h" #include "ompi/mca/fs/fs.h" /* diff --git a/ompi/mca/fs/pvfs2/fs_pvfs2_file_delete.c b/ompi/mca/fs/pvfs2/fs_pvfs2_file_delete.c index 2e0801c141..355770439e 100644 --- a/ompi/mca/fs/pvfs2/fs_pvfs2_file_delete.c +++ b/ompi/mca/fs/pvfs2/fs_pvfs2_file_delete.c @@ -2,7 +2,7 @@ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana * University Research and Technology * Corporation. All rights reserved. - * Copyright (c) 2004-2005 The University of Tennessee and The University + * Copyright (c) 2004-2011 The University of Tennessee and The University * of Tennessee Research Foundation. All rights * reserved. * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, @@ -27,7 +27,6 @@ #include "mpi.h" #include "ompi/constants.h" -#include "orte/util/show_help.h" #include "ompi/mca/fs/fs.h" /* diff --git a/ompi/mca/fs/pvfs2/fs_pvfs2_file_get_size.c b/ompi/mca/fs/pvfs2/fs_pvfs2_file_get_size.c index eb2b884f28..6eef1c521e 100644 --- a/ompi/mca/fs/pvfs2/fs_pvfs2_file_get_size.c +++ b/ompi/mca/fs/pvfs2/fs_pvfs2_file_get_size.c @@ -2,7 +2,7 @@ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana * University Research and Technology * Corporation. All rights reserved. - * Copyright (c) 2004-2005 The University of Tennessee and The University + * Copyright (c) 2004-2011 The University of Tennessee and The University * of Tennessee Research Foundation. All rights * reserved. * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, @@ -27,7 +27,6 @@ #include "mpi.h" #include "ompi/constants.h" -#include "orte/util/show_help.h" #include "ompi/mca/fs/fs.h" /* diff --git a/ompi/mca/fs/pvfs2/fs_pvfs2_file_open.c b/ompi/mca/fs/pvfs2/fs_pvfs2_file_open.c index 2fee1c9625..de8284e896 100644 --- a/ompi/mca/fs/pvfs2/fs_pvfs2_file_open.c +++ b/ompi/mca/fs/pvfs2/fs_pvfs2_file_open.c @@ -2,7 +2,7 @@ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana * University Research and Technology * Corporation. All rights reserved. - * Copyright (c) 2004-2005 The University of Tennessee and The University + * Copyright (c) 2004-2011 The University of Tennessee and The University * of Tennessee Research Foundation. All rights * reserved. * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, @@ -27,7 +27,6 @@ #include "mpi.h" #include "ompi/constants.h" -#include "orte/util/show_help.h" #include "ompi/mca/fs/fs.h" #include "ompi/communicator/communicator.h" #include "ompi/info/info.h" diff --git a/ompi/mca/fs/pvfs2/fs_pvfs2_file_set_info.c b/ompi/mca/fs/pvfs2/fs_pvfs2_file_set_info.c index d898634c09..566b3062f1 100644 --- a/ompi/mca/fs/pvfs2/fs_pvfs2_file_set_info.c +++ b/ompi/mca/fs/pvfs2/fs_pvfs2_file_set_info.c @@ -2,7 +2,7 @@ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana * University Research and Technology * Corporation. All rights reserved. - * Copyright (c) 2004-2005 The University of Tennessee and The University + * Copyright (c) 2004-2011 The University of Tennessee and The University * of Tennessee Research Foundation. All rights * reserved. * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, @@ -27,7 +27,6 @@ #include "mpi.h" #include "ompi/constants.h" -#include "orte/util/show_help.h" #include "ompi/mca/fs/fs.h" /* diff --git a/ompi/mca/fs/pvfs2/fs_pvfs2_file_set_size.c b/ompi/mca/fs/pvfs2/fs_pvfs2_file_set_size.c index f850ff5bf1..541e986c3f 100644 --- a/ompi/mca/fs/pvfs2/fs_pvfs2_file_set_size.c +++ b/ompi/mca/fs/pvfs2/fs_pvfs2_file_set_size.c @@ -2,7 +2,7 @@ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana * University Research and Technology * Corporation. All rights reserved. - * Copyright (c) 2004-2005 The University of Tennessee and The University + * Copyright (c) 2004-2011 The University of Tennessee and The University * of Tennessee Research Foundation. All rights * reserved. * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, @@ -27,7 +27,6 @@ #include "mpi.h" #include "ompi/constants.h" -#include "orte/util/show_help.h" #include "ompi/mca/fs/fs.h" /* diff --git a/ompi/mca/fs/pvfs2/fs_pvfs2_file_sync.c b/ompi/mca/fs/pvfs2/fs_pvfs2_file_sync.c index 1b3fd1f733..e302a7fc91 100644 --- a/ompi/mca/fs/pvfs2/fs_pvfs2_file_sync.c +++ b/ompi/mca/fs/pvfs2/fs_pvfs2_file_sync.c @@ -2,7 +2,7 @@ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana * University Research and Technology * Corporation. All rights reserved. - * Copyright (c) 2004-2005 The University of Tennessee and The University + * Copyright (c) 2004-2011 The University of Tennessee and The University * of Tennessee Research Foundation. All rights * reserved. * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, @@ -27,7 +27,6 @@ #include "mpi.h" #include "ompi/constants.h" -#include "orte/util/show_help.h" #include "ompi/mca/fs/fs.h" /* diff --git a/ompi/mca/fs/ufs/fs_ufs_file_close.c b/ompi/mca/fs/ufs/fs_ufs_file_close.c index 704abe4fe0..4ebedbd4c7 100644 --- a/ompi/mca/fs/ufs/fs_ufs_file_close.c +++ b/ompi/mca/fs/ufs/fs_ufs_file_close.c @@ -2,7 +2,7 @@ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana * University Research and Technology * Corporation. All rights reserved. - * Copyright (c) 2004-2005 The University of Tennessee and The University + * Copyright (c) 2004-2011 The University of Tennessee and The University * of Tennessee Research Foundation. All rights * reserved. * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, @@ -25,7 +25,6 @@ #include #include "mpi.h" #include "ompi/constants.h" -#include "orte/util/show_help.h" #include "ompi/mca/fs/fs.h" /* diff --git a/ompi/mca/fs/ufs/fs_ufs_file_delete.c b/ompi/mca/fs/ufs/fs_ufs_file_delete.c index af0a1c4f93..3d33285092 100644 --- a/ompi/mca/fs/ufs/fs_ufs_file_delete.c +++ b/ompi/mca/fs/ufs/fs_ufs_file_delete.c @@ -2,7 +2,7 @@ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana * University Research and Technology * Corporation. All rights reserved. - * Copyright (c) 2004-2005 The University of Tennessee and The University + * Copyright (c) 2004-2011 The University of Tennessee and The University * of Tennessee Research Foundation. All rights * reserved. * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, @@ -24,7 +24,6 @@ #include "mpi.h" #include "ompi/constants.h" -#include "orte/util/show_help.h" #include "ompi/mca/fs/fs.h" /* diff --git a/ompi/mca/fs/ufs/fs_ufs_file_get_size.c b/ompi/mca/fs/ufs/fs_ufs_file_get_size.c index 3b3be53d50..d103f50404 100644 --- a/ompi/mca/fs/ufs/fs_ufs_file_get_size.c +++ b/ompi/mca/fs/ufs/fs_ufs_file_get_size.c @@ -2,7 +2,7 @@ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana * University Research and Technology * Corporation. All rights reserved. - * Copyright (c) 2004-2005 The University of Tennessee and The University + * Copyright (c) 2004-2011 The University of Tennessee and The University * of Tennessee Research Foundation. All rights * reserved. * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, @@ -23,7 +23,6 @@ #include "mpi.h" #include "ompi/constants.h" -#include "orte/util/show_help.h" #include "ompi/mca/fs/fs.h" #include diff --git a/ompi/mca/fs/ufs/fs_ufs_file_open.c b/ompi/mca/fs/ufs/fs_ufs_file_open.c index 99ef28026b..d3902c5203 100644 --- a/ompi/mca/fs/ufs/fs_ufs_file_open.c +++ b/ompi/mca/fs/ufs/fs_ufs_file_open.c @@ -2,7 +2,7 @@ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana * University Research and Technology * Corporation. All rights reserved. - * Copyright (c) 2004-2005 The University of Tennessee and The University + * Copyright (c) 2004-2011 The University of Tennessee and The University * of Tennessee Research Foundation. All rights * reserved. * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, @@ -25,7 +25,6 @@ #include #include "mpi.h" #include "ompi/constants.h" -#include "orte/util/show_help.h" #include "ompi/mca/fs/fs.h" #include "ompi/communicator/communicator.h" #include "ompi/info/info.h" diff --git a/ompi/mca/fs/ufs/fs_ufs_file_set_info.c b/ompi/mca/fs/ufs/fs_ufs_file_set_info.c index 688a7e0f38..65216f8178 100644 --- a/ompi/mca/fs/ufs/fs_ufs_file_set_info.c +++ b/ompi/mca/fs/ufs/fs_ufs_file_set_info.c @@ -2,7 +2,7 @@ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana * University Research and Technology * Corporation. All rights reserved. - * Copyright (c) 2004-2005 The University of Tennessee and The University + * Copyright (c) 2004-2011 The University of Tennessee and The University * of Tennessee Research Foundation. All rights * reserved. * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, @@ -23,7 +23,6 @@ #include "mpi.h" #include "ompi/constants.h" -#include "orte/util/show_help.h" #include "ompi/mca/fs/fs.h" /* diff --git a/ompi/mca/fs/ufs/fs_ufs_file_set_size.c b/ompi/mca/fs/ufs/fs_ufs_file_set_size.c index 9cb4cd44d8..ae9f2cd8ad 100644 --- a/ompi/mca/fs/ufs/fs_ufs_file_set_size.c +++ b/ompi/mca/fs/ufs/fs_ufs_file_set_size.c @@ -2,7 +2,7 @@ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana * University Research and Technology * Corporation. All rights reserved. - * Copyright (c) 2004-2005 The University of Tennessee and The University + * Copyright (c) 2004-2011 The University of Tennessee and The University * of Tennessee Research Foundation. All rights * reserved. * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, @@ -23,7 +23,6 @@ #include "mpi.h" #include "ompi/constants.h" -#include "orte/util/show_help.h" #include "ompi/mca/fs/fs.h" #include diff --git a/ompi/mca/fs/ufs/fs_ufs_file_sync.c b/ompi/mca/fs/ufs/fs_ufs_file_sync.c index 30c227ed21..2a6e26fe2b 100644 --- a/ompi/mca/fs/ufs/fs_ufs_file_sync.c +++ b/ompi/mca/fs/ufs/fs_ufs_file_sync.c @@ -2,7 +2,7 @@ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana * University Research and Technology * Corporation. All rights reserved. - * Copyright (c) 2004-2005 The University of Tennessee and The University + * Copyright (c) 2004-2011 The University of Tennessee and The University * of Tennessee Research Foundation. All rights * reserved. * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, @@ -24,7 +24,6 @@ #include "mpi.h" #include "ompi/constants.h" -#include "orte/util/show_help.h" #include "ompi/mca/fs/fs.h" int diff --git a/ompi/mca/sharedfp/base/sharedfp_base_file_select.c b/ompi/mca/sharedfp/base/sharedfp_base_file_select.c index 305903875f..3954db7bf1 100644 --- a/ompi/mca/sharedfp/base/sharedfp_base_file_select.c +++ b/ompi/mca/sharedfp/base/sharedfp_base_file_select.c @@ -2,7 +2,7 @@ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana * University Research and Technology * Corporation. All rights reserved. - * Copyright (c) 2004-2005 The University of Tennessee and The University + * Copyright (c) 2004-2011 The University of Tennessee and The University * of Tennessee Research Foundation. All rights * reserved. * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, @@ -25,7 +25,6 @@ #include "opal/util/argv.h" #include "opal/mca/mca.h" #include "opal/mca/base/base.h" -#include "orte/util/show_help.h" #include "ompi/mca/sharedfp/sharedfp.h" #include "ompi/mca/sharedfp/base/base.h" #include "ompi/mca/io/ompio/io_ompio.h" @@ -292,7 +291,6 @@ int mca_sharedfp_base_file_select (struct mca_io_ompio_file_t *file, /* * This typically means that there was no component which was * able to run properly this time. So, we need to abort - * JMS replace with show_help */ OBJ_DESTRUCT(&queried); return OMPI_ERROR; diff --git a/ompi/mca/sharedfp/base/sharedfp_base_find_available.c b/ompi/mca/sharedfp/base/sharedfp_base_find_available.c index 18b4c30ce8..8dcd26d36a 100644 --- a/ompi/mca/sharedfp/base/sharedfp_base_find_available.c +++ b/ompi/mca/sharedfp/base/sharedfp_base_find_available.c @@ -2,7 +2,7 @@ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana * University Research and Technology * Corporation. All rights reserved. - * Copyright (c) 2004-2005 The University of Tennessee and The University + * Copyright (c) 2004-2011 The University of Tennessee and The University * of Tennessee Research Foundation. All rights * reserved. * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, @@ -25,7 +25,6 @@ #include "mpi.h" #include "ompi/constants.h" #include "opal/class/opal_list.h" -#include "orte/util/show_help.h" #include "opal/util/output.h" #include "opal/mca/mca.h" #include "opal/mca/base/base.h" diff --git a/ompi/mca/sharedfp/base/sharedfp_base_open.c b/ompi/mca/sharedfp/base/sharedfp_base_open.c index c6d4bd8d48..ffae1dcbe7 100644 --- a/ompi/mca/sharedfp/base/sharedfp_base_open.c +++ b/ompi/mca/sharedfp/base/sharedfp_base_open.c @@ -2,7 +2,7 @@ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana * University Research and Technology * Corporation. All rights reserved. - * Copyright (c) 2004-2005 The University of Tennessee and The University + * Copyright (c) 2004-2011 The University of Tennessee and The University * of Tennessee Research Foundation. All rights * reserved. * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, @@ -22,13 +22,10 @@ #include #include "ompi/class/ompi_free_list.h" -#include "orte/util/show_help.h" #include "opal/mca/mca.h" #include "opal/mca/base/base.h" #include "opal/mca/base/mca_base_param.h" -#include "orte/util/show_help.h" - #include "ompi/mca/sharedfp/sharedfp.h" #include "ompi/mca/sharedfp/base/base.h" diff --git a/ompi/mca/sharedfp/dummy/sharedfp_dummy_seek.c b/ompi/mca/sharedfp/dummy/sharedfp_dummy_seek.c index d1341849ce..944d05e09b 100644 --- a/ompi/mca/sharedfp/dummy/sharedfp_dummy_seek.c +++ b/ompi/mca/sharedfp/dummy/sharedfp_dummy_seek.c @@ -2,7 +2,7 @@ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana * University Research and Technology * Corporation. All rights reserved. - * Copyright (c) 2004-2005 The University of Tennessee and The University + * Copyright (c) 2004-2011 The University of Tennessee and The University * of Tennessee Research Foundation. All rights * reserved. * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, @@ -23,7 +23,6 @@ #include "mpi.h" #include "ompi/constants.h" -#include "orte/util/show_help.h" #include "ompi/mca/sharedfp/sharedfp.h" int diff --git a/ompi/mca/sharedfp/dummy/sharedfp_dummy_update.c b/ompi/mca/sharedfp/dummy/sharedfp_dummy_update.c index 586c618a0b..61e2b6e92a 100644 --- a/ompi/mca/sharedfp/dummy/sharedfp_dummy_update.c +++ b/ompi/mca/sharedfp/dummy/sharedfp_dummy_update.c @@ -2,7 +2,7 @@ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana * University Research and Technology * Corporation. All rights reserved. - * Copyright (c) 2004-2005 The University of Tennessee and The University + * Copyright (c) 2004-2011 The University of Tennessee and The University * of Tennessee Research Foundation. All rights * reserved. * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, @@ -23,7 +23,6 @@ #include "mpi.h" #include "ompi/constants.h" -#include "orte/util/show_help.h" #include "ompi/mca/sharedfp/sharedfp.h" int