From c2ce904d5d2d1e6d00798a8516135e0867a761c4 Mon Sep 17 00:00:00 2001 From: Quincey Koziol Date: Thu, 27 Aug 2015 16:52:15 -0500 Subject: [svn-r27598] Description: Check in misc. minor code cleanups, found during code review --- MANIFEST | 3 +-- configure.ac | 22 +++++++++++----------- examples/CMakeLists.txt | 18 +++++++++--------- src/H5Pdcpl.c | 3 +-- src/H5S.c | 16 +--------------- 5 files changed, 23 insertions(+), 39 deletions(-) diff --git a/MANIFEST b/MANIFEST index 45eaefc..10c2e57 100644 --- a/MANIFEST +++ b/MANIFEST @@ -1,4 +1,4 @@ - +# # Copyright by The HDF Group. # Copyright by the Board of Trustees of the University of Illinois. # All rights reserved. @@ -1234,7 +1234,6 @@ ./tools/misc/vds/UC_5_stride_gen.c ./tools/misc/vds/UC_common.h - # h5stat sources ./tools/h5stat/Makefile.am ./tools/h5stat/Makefile.in diff --git a/configure.ac b/configure.ac index eef593a..33f18f7 100644 --- a/configure.ac +++ b/configure.ac @@ -1882,16 +1882,16 @@ AC_ARG_ENABLE([debug], also specify a comma-separated list of package names without the leading H5 or the word no. The default is most packages - if production is disabled; no if it is enabled. + if production is disabled; no if it is enabled. ])], [DEBUG_PKG=$enableval]) ## Default to no if producton is enabled if test "X-$DEBUG_PKG" = X- ; then if test "$enable_production" = yes ; then - DEBUG_PKG=no + DEBUG_PKG=no else - DEBUG_PKG=yes + DEBUG_PKG=yes fi fi @@ -2139,11 +2139,11 @@ case "X-$enable_parallel" in ## Try link a simple MPI program. AC_MSG_CHECKING([whether a simple MPI-IO C program can be linked]) AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include ]], - [[ MPI_Init(0, (void *)0); - MPI_File_open(0, (void *)0, 0, 0, (void *)0);]])], - [AC_MSG_RESULT([yes])], - [AC_MSG_RESULT([no]) - AC_MSG_ERROR([unable to link a simple MPI-IO C program])]) + [[ MPI_Init(0, (void *)0); + MPI_File_open(0, (void *)0, 0, 0, (void *)0);]])], + [AC_MSG_RESULT([yes])], + [AC_MSG_RESULT([no]) + AC_MSG_ERROR([unable to link a simple MPI-IO C program])]) if test "X$HDF_FORTRAN" = "Xyes"; then PAC_PROG_FC_MPI_CHECK @@ -2928,9 +2928,9 @@ esac AC_MSG_CHECKING([whether to have library information embedded in the executables]) AC_ARG_ENABLE([embedded-libinfo], [AS_HELP_STRING([--enable-embedded-libinfo], - [Enable embedded library information [default=yes]])], - [enable_embedded_libinfo=$enableval], - [enable_embedded_libinfo=yes]) + [Enable embedded library information [default=yes]])], + [enable_embedded_libinfo=$enableval], + [enable_embedded_libinfo=yes]) if test "${enable_embedded_libinfo}" = "yes"; then AC_MSG_RESULT([yes]) diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index 8cabba6..8849ce7 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -10,20 +10,20 @@ add_definitions (${HDF_EXTRA_C_FLAGS}) # Define Sources #----------------------------------------------------------------------------- set (examples + h5_crtdat + h5_rdwt + h5_crtatt + h5_crtgrp + h5_crtgrpar + h5_crtgrpd + h5_cmprss + h5_extend + h5_subset h5_write h5_read h5_extend_write h5_chunk_read h5_compound - h5_crtgrpar - h5_crtgrpd - h5_subset - h5_cmprss - h5_crtdat - h5_rdwt - h5_crtatt - h5_extend - h5_crtgrp h5_group h5_select h5_attribute diff --git a/src/H5Pdcpl.c b/src/H5Pdcpl.c index 16577e7..69645a4 100644 --- a/src/H5Pdcpl.c +++ b/src/H5Pdcpl.c @@ -1478,8 +1478,7 @@ done: * * Purpose: Set the default layout information for the various types of * dataset layouts - - + * * Return: Non-negative on success/Negative on failure * * Programmer: Quincey Koziol diff --git a/src/H5S.c b/src/H5S.c index d8ab37c..bc95472 100644 --- a/src/H5S.c +++ b/src/H5S.c @@ -1869,14 +1869,7 @@ done: /*------------------------------------------------------------------------- * Function: H5S_set_extent * - * Purpose: Modify the dimensions of a dataspace. Based on H5S_extend. - * - * Note that this function does *not* clip unlimited - * selections, because it is not currently necessary to do - * that anywhere this function is called. If this becomes - * necessary (if the selection could be unlimited and the - * clip size is not being handled separately), this function - * must be updated to (optionally) clip the selection. + * Purpose: Modify the dimensions of a dataspace. Based on H5S_extend * * Return: Success: Non-negative * Failure: Negative @@ -1959,13 +1952,6 @@ H5S_has_extent(const H5S_t *ds) * * Purpose: Modify the dimensions of a dataspace. Based on H5S_extend * - * Note that this function does *not* clip unlimited - * selections, because it is not currently necessary to do - * that anywhere this function is called. If this becomes - * necessary (if the selection could be unlimited and the - * clip size is not being handled separately), this function - * must be updated to (optionally) clip the selection. - * * Return: Success: Non-negative * Failure: Negative * -- cgit v0.12