Whitespace cleanup compared to develop

22 files changed, 67 insertions, 67 deletions

diff --git a/Makefile.am b/Makefile.am
index d96ffe3..47da74d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,7 +13,7 @@
 ## Makefile.am
 ## Run automake to generate a Makefile.in from this file.
 ##
-# 
+#
 # This makefile mostly just reinvokes make in the various subdirectories
 # but does so in the correct order.  You can alternatively invoke make from
 # each subdirectory manually.
@@ -45,7 +45,7 @@ include $(top_srcdir)/config/commence.am
 # Since we're explicitly listing DIST_SUBDIRS, we also need to list
 # directories that are only conditionally built (so that their Makefiles
 # are cleaned as well).
-# Note that `make clean' will not affect the examples or doc directories. 
+# Note that `make clean' will not affect the examples or doc directories.
 
 # Conditionals.  These conditionals are defined during configure
 # Define each variable to empty if it is not used to placate pmake
@@ -133,7 +133,7 @@ mostlyclean-local:
 # 'make install' will now install examples, the same as 'make install-all'.
 # 'make-install-all' will be redundant but will still work.
 install: install-recursive install-examples
-uninstall: uninstall-recursive uninstall-examples 
+uninstall: uninstall-recursive uninstall-examples
 
 # 'make install-all' also installs examples
 install-all:
@@ -154,7 +154,7 @@ install-doc:
 uninstall-doc:
 	@echo "docs no longer live in this tree.  Use install-examples to install examples."
 
-# `make check-install' or `make installcheck' checks that examples can 
+# `make check-install' or `make installcheck' checks that examples can
 #  be successfully built
 installcheck-local:
 	if test -n "${DESTDIR}"; then                                  \
diff --git a/README.txt b/README.txt
index b056f81..ba296df 100644
--- a/README.txt
+++ b/README.txt
@@ -7,8 +7,8 @@ Please refer to the release_docs/INSTALL file for installation instructions.
 THE HDF GROUP
 ---------------
 
-The HDF Group is the developer of HDF5®, a high-performance software library and 
-data format that has been adopted across multiple industries and has become a 
+The HDF Group is the developer of HDF5®, a high-performance software library and
+data format that has been adopted across multiple industries and has become a
 de facto standard in scientific and research communities.
 
 More information about The HDF Group, the HDF5 Community and the HDF5 software
@@ -19,21 +19,21 @@ project, tools and services can be found at the Group's website.
 
 DOCUMENTATION
 -------------
-This release is fully functional for the API described in the documentation. 
+This release is fully functional for the API described in the documentation.
     https://portal.hdfgroup.org/display/HDF5/The+HDF5+API
 
 Full Documentation and Programming Resources for this release can be found at
     https://portal.hdfgroup.org/display/HDF5
 
-See the RELEASE.txt file in the release_docs/ directory for information specific 
-to the features and updates included in this release of the library. 
+See the RELEASE.txt file in the release_docs/ directory for information specific
+to the features and updates included in this release of the library.
 
-Several more files are located within the release_docs/ directory with specific 
+Several more files are located within the release_docs/ directory with specific
 details for several common platforms and configurations.
 
     INSTALL - Start Here. General instructions for compiling and installing the library
     INSTALL_CMAKE  - instructions for building with CMake (Kitware.com)
-    INSTALL_parallel - instructions for building and configuring Parallel HDF5 
+    INSTALL_parallel - instructions for building and configuring Parallel HDF5
     INSTALL_Windows and INSTALL_Cygwin - MS Windows installations.
 
 
@@ -48,7 +48,7 @@ Information regarding Help Desk and Support services is available at
 
 FORUM and NEWS
 --------------
-The following public forums are provided for public announcements and discussions 
+The following public forums are provided for public announcements and discussions
 of interest to the general HDF5 Community.
 
     Homepage of the Forum
@@ -59,10 +59,10 @@ of interest to the general HDF5 Community.
 
     HDF5 and HDF4 Topics
         https://forum.hdfgroup.org/c/hdf5
- 
-These forums are provided as an open and public service for searching and reading. 
-Posting requires completing a simple registration and allows one to join in the 
-conversation.  Please read the following instructions pertaining to the Forum's 
+
+These forums are provided as an open and public service for searching and reading.
+Posting requires completing a simple registration and allows one to join in the
+conversation.  Please read the following instructions pertaining to the Forum's
 use and configuration
     https://forum.hdfgroup.org/t/quickstart-guide-welcome-to-the-new-hdf-forum
 
diff --git a/c++/src/H5CppDoc.h b/c++/src/H5CppDoc.h
index 5e80408..1108181 100644
--- a/c++/src/H5CppDoc.h
+++ b/c++/src/H5CppDoc.h
@@ -25,7 +25,7 @@
  * \section intro_sec Introduction
  *
  * The C++ API provides C++ wrappers for the HDF5 C Library.
- * 
+ *
  * It is assumed that the user has knowledge of the HDF5 file format and its
  * components.  For more information on the HDF5 C Library, please refer to
  * the HDF5 Software Documentation page.
@@ -54,9 +54,9 @@
  * \section install_sec Installation
  *
  * The HDF5 C++ API is included with the HDF5 source code.
- * 
- * Please refer to the release_docs/INSTALL file under the top directory 
- * of the HDF5 source code for information about installing, building, 
+ *
+ * Please refer to the release_docs/INSTALL file under the top directory
+ * of the HDF5 source code for information about installing, building,
  * and testing the C++ API.
  *
  * <br />
diff --git a/c++/src/H5DataType.cpp b/c++/src/H5DataType.cpp
index 081cc03..0472975 100644
--- a/c++/src/H5DataType.cpp
+++ b/c++/src/H5DataType.cpp
@@ -122,7 +122,7 @@ DataType::DataType(const H5Location& loc, const void* ref, H5R_type_t ref_type,
 {
     id = H5Location::p_dereference(attr.getId(), ref, ref_type, plist, "constructor - by dereference");
 }
- */ 
+ */
 
 //--------------------------------------------------------------------------
 // Function:    DataType copy constructor
diff --git a/c++/src/H5Exception.cpp b/c++/src/H5Exception.cpp
index cf9e577..7431e6c 100644
--- a/c++/src/H5Exception.cpp
+++ b/c++/src/H5Exception.cpp
@@ -60,7 +60,7 @@ H5std_string Exception::getMajorString(hid_t err_major) const
 {
     // Preliminary call to H5Eget_msg() to get the length of the message
     ssize_t mesg_size = H5Eget_msg(err_major, NULL, NULL, 0);
- 
+
     // If H5Eget_msg() returns a negative value, raise an exception,
     if (mesg_size < 0)
         throw IdComponentException("Exception::getMajorString",
diff --git a/c++/src/H5IntType.cpp b/c++/src/H5IntType.cpp
index 49c638e..01c20e9 100644
--- a/c++/src/H5IntType.cpp
+++ b/c++/src/H5IntType.cpp
@@ -83,7 +83,7 @@ IntType::IntType(const DataSet& dataset) : AtomType()
 {
     // Calls C function H5Dget_type to get the id of the datatype
     id = H5Dget_type(dataset.getId());
- 
+
     if (id < 0)
     {
         throw DataSetIException("IntType constructor", "H5Dget_type failed");
diff --git a/c++/src/H5Location.cpp b/c++/src/H5Location.cpp
index 764aa12..89a7890 100644
--- a/c++/src/H5Location.cpp
+++ b/c++/src/H5Location.cpp
@@ -568,7 +568,7 @@ void H5Location::dereference(const H5Location& loc, const void* ref, H5R_type_t
 {
    p_setId(p_dereference(attr.getId(), ref, ref_type, plist, "dereference"));
 }
- */ 
+ */
 
 #ifndef H5_NO_DEPRECATED_SYMBOLS
 //--------------------------------------------------------------------------
diff --git a/c++/src/H5Location.h b/c++/src/H5Location.h
index 3bad8bc..3c30715 100644
--- a/c++/src/H5Location.h
+++ b/c++/src/H5Location.h
@@ -72,7 +72,7 @@ class H5_DLLCPP H5Location : public IdComponent {
 
         // Creates a reference to a named object or to a dataset region
         // in this object.
-        void reference(void* ref, const char* name, 
+        void reference(void* ref, const char* name,
                         H5R_type_t ref_type = H5R_OBJECT) const;
         void reference(void* ref, const H5std_string& name,
                         H5R_type_t ref_type = H5R_OBJECT) const;
diff --git a/c++/src/H5Object.h b/c++/src/H5Object.h
index 033b1b7..a63229c 100644
--- a/c++/src/H5Object.h
+++ b/c++/src/H5Object.h
@@ -31,7 +31,7 @@ namespace H5 {
                 H5Object is H5File is not an HDF5 object, and renaming H5Object
                 to H5Location will risk breaking user applications.
                 -BMR
-        Apr 2, 2014: Added wrapper getObjName for H5Iget_name 
+        Apr 2, 2014: Added wrapper getObjName for H5Iget_name
         Sep 21, 2016: Rearranging classes (HDFFV-9920) moved H5A wrappers back
                 into H5Object.  This way, C functions that takes attribute id
                 can be in H5Location and those that cannot take attribute id
diff --git a/c++/src/h5c++.in b/c++/src/h5c++.in
index f068f51..5a542f9 100644
--- a/c++/src/h5c++.in
+++ b/c++/src/h5c++.in
@@ -311,7 +311,7 @@ fi
 
 if test "x$do_link" = "xyes"; then
   shared_link=""
-  # conditionally link with the hl library  
+  # conditionally link with the hl library
   if test "X$HL" = "Xhl"; then
    libraries=" $libraries -lhdf5_hl_cpp -lhdf5_cpp -lhdf5_hl -lhdf5 "
   else
diff --git a/c++/test/dsets.cpp b/c++/test/dsets.cpp
index fc29307..76e4424 100644
--- a/c++/test/dsets.cpp
+++ b/c++/test/dsets.cpp
@@ -268,7 +268,7 @@ static herr_t test_simple_io( H5File& file)
 /*-------------------------------------------------------------------------
  * Function:    test_datasize
  *
- * Purpose      Tests DataSet::getInMemDataSize().  
+ * Purpose      Tests DataSet::getInMemDataSize().
  *
  * Return       Success: 0
  *
@@ -901,7 +901,7 @@ static herr_t test_multiopen (H5File& file)
         if (cur_size[0]!=tmp_size[0])
         {
             cerr << "    Got " << static_cast<int>(tmp_size[0])
-                 << " instead of " << static_cast<int>(cur_size[0]) 
+                 << " instead of " << static_cast<int>(cur_size[0])
                  << "!" << endl;
             throw Exception("test_multiopen", "Failed in multi-open with extending");
         }
diff --git a/c++/test/h5cpputil.h b/c++/test/h5cpputil.h
index 18fd44f..6664d0c 100644
--- a/c++/test/h5cpputil.h
+++ b/c++/test/h5cpputil.h
@@ -55,7 +55,7 @@ class TestFailedException : public Exception {
 
 // Overloaded/Template functions to verify values and display proper info
 
-// Verifies 
+// Verifies
 void verify_val(const char* x, const char* value, const char* where, int line, const char* file_name);
 
 template <class Type1, class Type2>
diff --git a/c++/test/tarray.cpp b/c++/test/tarray.cpp
index 69c58f8..d80de16 100644
--- a/c++/test/tarray.cpp
+++ b/c++/test/tarray.cpp
@@ -210,7 +210,7 @@ static void test_array_compound_array()
         // Verify the compound datatype info
         CompType ctype_check(base_type.getId());
         base_type.close();
-        
+
         // Check the number of members
         nmemb = ctype_check.getNmembers();
         verify_val(nmemb, 2, "ctype_check.getNmembers", __LINE__, __FILE__);
@@ -282,11 +282,11 @@ static void test_array_compound_array()
  */
 H5::DataType getArr()
 {
-    hsize_t *dims = new hsize_t; 
-    *dims = 5; 
-    H5::ArrayType ret; 
-    ret = H5::ArrayType(H5::PredType::NATIVE_INT, 1, dims); 
-    delete dims; 
+    hsize_t *dims = new hsize_t;
+    *dims = 5;
+    H5::ArrayType ret;
+    ret = H5::ArrayType(H5::PredType::NATIVE_INT, 1, dims);
+    delete dims;
     return ret;
 }
 
diff --git a/c++/test/tattr.cpp b/c++/test/tattr.cpp
index 9485ec6..f432723 100644
--- a/c++/test/tattr.cpp
+++ b/c++/test/tattr.cpp
@@ -282,7 +282,7 @@ static void test_attr_getname()
         if (attr_exists == false)
             throw InvalidActionException("H5File::attrExists", "Attribute should exist but does not");
 
-        // Open attribute 
+        // Open attribute
         Attribute fattr1(fid1.openAttribute(FATTR1_NAME));
 
         // A. Get attribute name with
@@ -1221,7 +1221,7 @@ static void test_attr_delete()
         attr_name = fattr.getName();
         verify_val(attr_name, FATTR1_NAME, "Attribute::getName", __LINE__, __FILE__);
         fattr.close();
-        
+
         // Test deleting non-existing attribute
 
         // Open the dataset
diff --git a/c++/test/tfile.cpp b/c++/test/tfile.cpp
index a0231a6..f5625a3 100644
--- a/c++/test/tfile.cpp
+++ b/c++/test/tfile.cpp
@@ -633,7 +633,7 @@ static void test_file_attribute()
         verify_val(num_objs, 0, "H5File::getObjCount(H5F_OBJ_DATATYPE)", __LINE__, __FILE__);
         num_objs = file5.getObjCount(H5F_OBJ_FILE);
         verify_val(num_objs, 1, "H5File::getObjCount(H5F_OBJ_FILE)", __LINE__, __FILE__);
-        
+
         // Get the file name using the attributes
         H5std_string fname = fattr1.getFileName();
         verify_val(fname, FILE5, "H5File::getFileName()", __LINE__, __FILE__);
@@ -984,7 +984,7 @@ static void test_file_info()
     /*  ret=H5Pget_shared_mesg_nindexes(fcpl2,&nindexes);
     CHECK(ret, FAIL, "H5Pget_shared_mesg_nindexes");
     VERIFY(nindexes, MISC11_NINDEXES, "H5Pget_shared_mesg_nindexes");
- */ 
+ */
 
         // Get and verify the file space info from the creation property list */
         fcpl2.getFileSpaceStrategy(out_strategy, out_persist, out_threshold);
diff --git a/c++/test/titerate.cpp b/c++/test/titerate.cpp
index c689087..d69e8d2 100644
--- a/c++/test/titerate.cpp
+++ b/c++/test/titerate.cpp
@@ -400,7 +400,7 @@ static void test_HDFFV_9920()
 {
     int attr_data[2] = { 100, 200};
     hsize_t dims[1] = { DIM1 };
-    
+
     try
     {
         // Create a new file and a group in it
@@ -414,13 +414,13 @@ static void test_HDFFV_9920()
         DataSet fds = file.createDataSet(FDATASET_NAME, PredType::STD_I32BE, dspace);
         DataSet gds = gr1.createDataSet(GDATASET_NAME, PredType::STD_I32BE, dspace);
 
-        // Create a file attribute and a group attribute. 
-        Attribute fa1 = file.createAttribute(FATTR_NAME, PredType::STD_I32BE, 
+        // Create a file attribute and a group attribute.
+        Attribute fa1 = file.createAttribute(FATTR_NAME, PredType::STD_I32BE,
                                                   dspace);
-        Attribute ga1 = gr1.createAttribute(GATTR_NAME, PredType::STD_I32BE, 
+        Attribute ga1 = gr1.createAttribute(GATTR_NAME, PredType::STD_I32BE,
                                                   dspace);
-     
-        // Write the attribute data. 
+
+        // Write the attribute data.
         fa1.write( PredType::NATIVE_INT, attr_data);
         ga1.write( PredType::NATIVE_INT, attr_data);
 
diff --git a/c++/test/trefer.cpp b/c++/test/trefer.cpp
index 8a6fb51..b46ae29 100644
--- a/c++/test/trefer.cpp
+++ b/c++/test/trefer.cpp
@@ -476,7 +476,7 @@ static void test_reference_group()
         // Check getting file name given the group dereferenced via constructor
         H5std_string fname = refgroup.getFileName();
         verify_val(fname, FILE1, "H5Group::getFileName",__LINE__,__FILE__);
-    
+
         // Check getting file name given the group dereferenced by ::reference
         fname = group.getFileName();
         verify_val(fname, FILE1, "H5Group::getFileName",__LINE__,__FILE__);
diff --git a/c++/test/ttypes.cpp b/c++/test/ttypes.cpp
index 81ad983..b8846f4 100644
--- a/c++/test/ttypes.cpp
+++ b/c++/test/ttypes.cpp
@@ -54,7 +54,7 @@ using namespace H5;
     H5T_NATIVE_##TYPE##_ALIGN_g=MAX(H5T_NATIVE_##TYPE##_ALIGN_g, VAL)
 #endif
  /* #include "H5Tpkg.h"
- */ 
+ */
 
 const char *FILENAME[] = {
     "dtypes1.h5",
@@ -392,7 +392,7 @@ static void test_vltype()
     try
     {
         VarLenType vltype(PredType::NATIVE_INT);
-        
+
         bool in_class = vltype.detectClass(H5T_VLEN);
         verify_val(in_class, true, "VarLenType::detectClass() with H5T_VLEN", __LINE__, __FILE__);
         in_class = vltype.detectClass(H5T_INTEGER);
diff --git a/config/cmake/PkgInfo.in b/config/cmake/PkgInfo.in
index e530f88..ae54035 100644
--- a/config/cmake/PkgInfo.in
+++ b/config/cmake/PkgInfo.in
@@ -1 +1 @@
-FMWK????
\ No newline at end of file
+FMWK????
diff --git a/config/commence.am b/config/commence.am
index 830c494..41e0f3f 100644
--- a/config/commence.am
+++ b/config/commence.am
@@ -44,15 +44,15 @@ LIBH5CPP_HL=$(top_builddir)/hl/c++/src/libhdf5_hl_cpp.la
 # Install directories that automake doesn't know about
 docdir = $(exec_prefix)/doc
 
-# Note that in svn revision 19400 the '/' after DESTDIR in H5* variables below  
-# has been removed. According to the official description of DESTDIR by Gnu at 
-# http://www.gnu.org/prep/standards/html_node/DESTDIR.html, DESTDIR is 
-# prepended to the normal and complete install path that it precedes for the 
-# purpose of installing in a temporary directory which is useful for building 
-# rpms and other packages.  The '/' after ${DESTDIR} will be followed by another 
-# '/' at the beginning of the normal install path.  When DESTDIR is empty the  
-# path then begins with '//', which is incorrect and causes problems at least for 
-# Cygwin.   
+# Note that in svn revision 19400 the '/' after DESTDIR in H5* variables below
+# has been removed. According to the official description of DESTDIR by Gnu at
+# http://www.gnu.org/prep/standards/html_node/DESTDIR.html, DESTDIR is
+# prepended to the normal and complete install path that it precedes for the
+# purpose of installing in a temporary directory which is useful for building
+# rpms and other packages.  The '/' after ${DESTDIR} will be followed by another
+# '/' at the beginning of the normal install path.  When DESTDIR is empty the
+# path then begins with '//', which is incorrect and causes problems at least for
+# Cygwin.
 
 # Scripts used to build examples
 # If only shared libraries have been installed, have h5cc build examples with
@@ -62,11 +62,11 @@ H5CC_PP=${DESTDIR}$(bindir)/h5pcc
 H5FC=${DESTDIR}$(bindir)/h5fc
 H5FC_PP=${DESTDIR}$(bindir)/h5pfc
 H5CPP=${DESTDIR}$(bindir)/h5c++
-  
+
 
 # H5_CFLAGS holds flags that should be used when building hdf5,
 # but which should not be exported to h5cc for building other programs.
-# AM_CFLAGS is an automake construct which should be used by Makefiles 
+# AM_CFLAGS is an automake construct which should be used by Makefiles
 # instead of CFLAGS, as CFLAGS is reserved solely for the user to define.
 # This applies to FCFLAGS, CXXFLAGS, CPPFLAGS, and LDFLAGS as well.
 
diff --git a/config/conclude.am b/config/conclude.am
index 58c2934..3f05a69 100644
--- a/config/conclude.am
+++ b/config/conclude.am
@@ -25,8 +25,8 @@ LIB = $(lib_LIBRARIES) $(lib_LTLIBRARIES) $(noinst_LIBRARIES)                 \
       $(noinst_LTLIBRARIES) $(check_LIBRARIES) $(check_LTLIBRARIES) $(EXTRA_LIB)
 PROGS = $(bin_PROGRAMS) $(bin_SCRIPTS) $(noinst_PROGRAMS) $(noinst_SCRIPTS)   \
         $(EXTRA_PROG)
-chk_TESTS = $(check_PROGRAMS) $(check_SCRIPTS) $(EXTRA_TEST) 
-TESTS = $(TEST_PROG) $(TEST_SCRIPT) $(EXTRA_TEST) 
+chk_TESTS = $(check_PROGRAMS) $(check_SCRIPTS) $(EXTRA_TEST)
+TESTS = $(TEST_PROG) $(TEST_SCRIPT) $(EXTRA_TEST)
 
 TEST_EXTENSIONS = .sh
 SH_LOG_COMPILER = $(SHELL)
@@ -198,7 +198,7 @@ $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_:
               fi; \
 	   fi; \
 	fi
- 
+
 # The dummysh.chkexe here prevents the target from being
 # empty if there are no tests in the current directory.
 # $${log} is the log file.
diff --git a/config/examples.am b/config/examples.am
index 247dfa8..e06f4ea 100644
--- a/config/examples.am
+++ b/config/examples.am
@@ -33,7 +33,7 @@
 ## INSTALL_TOP_FILES
 ##
 ## EXAMPLEDIR
-## The directory into which examples should be installed. 
+## The directory into which examples should be installed.
 ##
 ## Build rules for $(EXTRA_PROG).
 ## Dependencies for example programs.
@@ -62,7 +62,7 @@ install-data-local:
 uninstall-local:
 	@$(MAKE) $(AM_MAKEFLAGS) uninstall-examples
 
-install-examples: $(EXAMPLEDIR) $(INSTALL_FILES) 
+install-examples: $(EXAMPLEDIR) $(INSTALL_FILES)
 	@for f in X $(INSTALL_FILES); do                                     \
 	  if test $$f != X; then                                             \
 	    (set -x; $(INSTALL) $(srcdir)/$$f $(EXAMPLEDIR)/. || exit 1);    \
@@ -109,7 +109,7 @@ installcheck-local:
 	  H5CCFLAGS="-shlib" $(MAKE) $(AM_MAKEFLAGS) check;                \
 	else                                                              \
 	  $(MAKE) $(AM_MAKEFLAGS) check;                                   \
-	fi 
+	fi
 	@if test "$(INSTALL_FILES)" -a $(TEST_EXAMPLES_SCRIPT) -a -d $(EXAMPLEDIR); then \
 	    echo "============================";                                         \
 	    echo "Testing $(TEST_EXAMPLES_SCRIPT)";                                      \