summaryrefslogtreecommitdiffstats
path: root/c++
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2008-09-16 15:52:51 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2008-09-16 15:52:51 (GMT)
commitbdd7d59902483885dd8b883f3b2393e77383e5e8 (patch)
treeaaf20ab132d057b95b3c016d50fc22b77719084b /c++
parent8bc0d5ed9019a681e1ea20c24264415d01c1cf2a (diff)
downloadhdf5-bdd7d59902483885dd8b883f3b2393e77383e5e8.zip
hdf5-bdd7d59902483885dd8b883f3b2393e77383e5e8.tar.gz
hdf5-bdd7d59902483885dd8b883f3b2393e77383e5e8.tar.bz2
[svn-r15628] Description:
Remove trailing whitespace from C/C++ source files, with the following script: foreach f (*.[ch] *.cpp) sed 's/[[:blank:]]*$//' $f > sed.out && mv sed.out $f end Tested on: Mac OS X/32 10.5.5 (amazon) No need for h5committest, just whitespace changes...
Diffstat (limited to 'c++')
-rw-r--r--c++/examples/chunks.cpp2
-rw-r--r--c++/examples/h5group.cpp4
-rw-r--r--c++/src/H5Attribute.cpp2
-rw-r--r--c++/src/H5CommonFG.cpp2
-rw-r--r--c++/src/H5Cpp.h4
-rw-r--r--c++/src/H5DataSet.cpp2
-rw-r--r--c++/src/H5DataType.cpp10
-rw-r--r--c++/src/H5DcreatProp.cpp10
-rw-r--r--c++/src/H5Group.cpp2
-rw-r--r--c++/src/H5IdComponent.cpp4
-rw-r--r--c++/src/H5Object.cpp4
-rw-r--r--c++/test/h5cpputil.cpp2
-rw-r--r--c++/test/tattr.cpp2
-rw-r--r--c++/test/tcompound.cpp54
-rw-r--r--c++/test/tfilter.cpp6
-rw-r--r--c++/test/th5s.cpp2
-rw-r--r--c++/test/trefer.cpp10
-rw-r--r--c++/test/ttypes.cpp26
-rw-r--r--c++/test/tvlstr.cpp18
19 files changed, 83 insertions, 83 deletions
diff --git a/c++/examples/chunks.cpp b/c++/examples/chunks.cpp
index b39c47b..286934a 100644
--- a/c++/examples/chunks.cpp
+++ b/c++/examples/chunks.cpp
@@ -80,7 +80,7 @@ int main (void)
hsize_t dims[2]; // dataset dimensions
rank = filespace.getSimpleExtentDims( dims );
cout << "dataset rank = " << rank << ", dimensions "
- << (unsigned long)(dims[0]) << " x "
+ << (unsigned long)(dims[0]) << " x "
<< (unsigned long)(dims[1]) << endl;
/*
diff --git a/c++/examples/h5group.cpp b/c++/examples/h5group.cpp
index 09dc7ee..a5137bc 100644
--- a/c++/examples/h5group.cpp
+++ b/c++/examples/h5group.cpp
@@ -94,7 +94,7 @@ int main(void)
* Create the first dataset.
*/
DataSet* dataset = new DataSet(file->createDataSet(
- "/Data/Compressed_Data", PredType::NATIVE_INT,
+ "/Data/Compressed_Data", PredType::NATIVE_INT,
*dataspace, ds_creatplist ));
/*
@@ -109,7 +109,7 @@ int main(void)
dims[0] = 500;
dims[1] = 20;
dataspace = new DataSpace(RANK, dims); // create second dspace
- dataset = new DataSet(file->createDataSet("/Data/Float_Data",
+ dataset = new DataSet(file->createDataSet("/Data/Float_Data",
PredType::NATIVE_FLOAT, *dataspace));
delete dataset;
diff --git a/c++/src/H5Attribute.cpp b/c++/src/H5Attribute.cpp
index 404aec9..fd08744 100644
--- a/c++/src/H5Attribute.cpp
+++ b/c++/src/H5Attribute.cpp
@@ -348,7 +348,7 @@ Attribute::Attribute(H5File& h5file, void* ref) : AbstractDs(), IdComponent()
// Purpose: Get the id of this attribute
// Description:
// Class hierarchy is revised to address bugzilla 1068. Class
-// AbstractDS and Attribute are moved out of H5Object. In
+// AbstractDS and Attribute are moved out of H5Object. In
// addition, member IdComponent::id is moved into subclasses, and
// IdComponent::getId now becomes pure virtual function.
// Programmer Binh-Minh Ribler - May, 2008
diff --git a/c++/src/H5CommonFG.cpp b/c++/src/H5CommonFG.cpp
index 71658df..80efc5d 100644
--- a/c++/src/H5CommonFG.cpp
+++ b/c++/src/H5CommonFG.cpp
@@ -244,7 +244,7 @@ DataSet CommonFG::openDataSet( const H5std_string& name ) const
///\par Description
/// Note that both names are interpreted relative to the
/// specified location.
-/// For information on creating hard link and soft link, please
+/// For information on creating hard link and soft link, please
/// refer to the C layer Reference Manual at:
/// http://hdfgroup.org/HDF5/doc/RM/RM_H5L.html#Link-CreateHard and
/// http://hdfgroup.org/HDF5/doc/RM/RM_H5L.html#Link-CreateSoft
diff --git a/c++/src/H5Cpp.h b/c++/src/H5Cpp.h
index 3814369..75d82ba 100644
--- a/c++/src/H5Cpp.h
+++ b/c++/src/H5Cpp.h
@@ -44,9 +44,9 @@
#include "H5Group.h"
#include "H5File.h"
#include "H5Library.h"
-
+
/* Some C++ compilers do not have offsetof macro; define to bypass the problem
- - BMR- -EIP- 2007/08/01
+ - BMR- -EIP- 2007/08/01
*/
#ifndef H5_CXX_HAVE_OFFSETOF
#ifdef HOFFSET
diff --git a/c++/src/H5DataSet.cpp b/c++/src/H5DataSet.cpp
index 3051e08..6d7502a 100644
--- a/c++/src/H5DataSet.cpp
+++ b/c++/src/H5DataSet.cpp
@@ -83,7 +83,7 @@ DataSet::DataSet(const DataSet& original) : AbstractDs(original), H5Object(origi
///\param ref - IN: Reference pointer
///\exception H5::DataSetIException
///\parDescription
-/// \c obj can be DataSet, Group, H5File, or named DataType, that
+/// \c obj can be DataSet, Group, H5File, or named DataType, that
/// is a datatype that has been named by DataType::commit.
// Programmer Binh-Minh Ribler - Oct, 2006
//--------------------------------------------------------------------------
diff --git a/c++/src/H5DataType.cpp b/c++/src/H5DataType.cpp
index e023bda..2b03ffc 100644
--- a/c++/src/H5DataType.cpp
+++ b/c++/src/H5DataType.cpp
@@ -91,7 +91,7 @@ DataType::DataType( const H5T_class_t type_class, size_t size ) : H5Object()
///\param obj - IN: Location reference object is in
///\param ref - IN: Reference pointer
///\parDescription
-/// \c obj can be DataSet, Group, H5File, or named DataType, that
+/// \c obj can be DataSet, Group, H5File, or named DataType, that
/// is a datatype that has been named by DataType::commit.
// Programmer Binh-Minh Ribler - Oct, 2006
//--------------------------------------------------------------------------
@@ -99,7 +99,7 @@ DataType::DataType( const H5T_class_t type_class, size_t size ) : H5Object()
{
H5Object::dereference(obj, ref);
}
- */
+ */
DataType::DataType(H5Object& obj, void* ref) : H5Object()
{
id = obj.p_dereference(ref);
@@ -122,7 +122,7 @@ DataType::DataType() : H5Object(), id(0) {}
///\brief Copy constructor: makes a copy of the original DataType object.
// Programmer Binh-Minh Ribler - 2000
//--------------------------------------------------------------------------
-DataType::DataType(const DataType& original) : H5Object(original)
+DataType::DataType(const DataType& original) : H5Object(original)
{
id = original.getId();
incRefCount(); // increment number of references to this id
@@ -159,7 +159,7 @@ void DataType::copy( const DataType& like_type )
//--------------------------------------------------------------------------
// Function: DataType::copy
///\brief Copies the datatype of the given dataset to this datatype object
-///\param dset - IN: Dataset
+///\param dset - IN: Dataset
///\exception H5::DataTypeIException
// Programmer Binh-Minh Ribler - Jan, 2007
///\parDescription
@@ -227,7 +227,7 @@ bool DataType::operator==(const DataType& compared_type ) const
// Function: DataType::p_commit (private)
//\brief Commits a transient datatype to a file, creating a new
// named datatype
-//\param loc_id - IN: The id of either a file, group, dataset, named
+//\param loc_id - IN: The id of either a file, group, dataset, named
// datatype, or attribute.
//\param name - IN: Name of the datatype
//\exception H5::DataTypeIException
diff --git a/c++/src/H5DcreatProp.cpp b/c++/src/H5DcreatProp.cpp
index 19a4e6e..981085d 100644
--- a/c++/src/H5DcreatProp.cpp
+++ b/c++/src/H5DcreatProp.cpp
@@ -172,16 +172,16 @@ void DSetCreatPropList::setDeflate( int level ) const
//--------------------------------------------------------------------------
// Function: DSetCreatPropList::setSzip
///\brief Sets up for the use of the SZIP compression filter.
-///\param options_mask - IN: A bit-mask conveying the desired SZIP
-/// options. Valid values are H5_SZIP_EC_OPTION_MASK
+///\param options_mask - IN: A bit-mask conveying the desired SZIP
+/// options. Valid values are H5_SZIP_EC_OPTION_MASK
/// and H5_SZIP_NN_OPTION_MASK.
-///\param pixels_per_block - IN: Number of pixels or data elements in
+///\param pixels_per_block - IN: Number of pixels or data elements in
/// each data block.
///\exception H5::PropListIException
///\par Description
-/// The associate C function sets an SZIP compression filter,
+/// The associate C function sets an SZIP compression filter,
/// H5Z_FILTER_SZIP, for a dataset. For more information about
-/// SZIP and usage, please refer to the C layer Reference
+/// SZIP and usage, please refer to the C layer Reference
/// Manual at:
/// http://hdfgroup.org/HDF5/doc/RM_H5P.html#Property-SetSzip
// Programmer Binh-Minh Ribler - Jan, 2007
diff --git a/c++/src/H5Group.cpp b/c++/src/H5Group.cpp
index f50691e..6ae7cf7 100644
--- a/c++/src/H5Group.cpp
+++ b/c++/src/H5Group.cpp
@@ -92,7 +92,7 @@ Group::Group(const hid_t existing_id) : H5Object()
/// obj - IN: Location reference object is in
///\param ref - IN: Reference pointer
///\parDescription
-/// \c obj can be DataSet, Group, H5File, or named DataType, that
+/// \c obj can be DataSet, Group, H5File, or named DataType, that
/// is a datatype that has been named by DataType::commit.
// Programmer Binh-Minh Ribler - Oct, 2006
//--------------------------------------------------------------------------
diff --git a/c++/src/H5IdComponent.cpp b/c++/src/H5IdComponent.cpp
index a068b20..747a479 100644
--- a/c++/src/H5IdComponent.cpp
+++ b/c++/src/H5IdComponent.cpp
@@ -199,9 +199,9 @@ IdComponent& IdComponent::operator=( const IdComponent& rhs )
// Changed all subclasses' setId to p_setId and put back setId
// here. p_setId is used in the library where the id provided
// by a C API passed on to user's application in the form of a
-// C++ API object, which will be destroyed properly, and so
+// C++ API object, which will be destroyed properly, and so
// p_setId does not call incRefCount. On the other hand, the
-// public version setId is used by other applications, in which
+// public version setId is used by other applications, in which
// the id passed to setId already has a reference count, so setId
// must call incRefCount.
//--------------------------------------------------------------------------
diff --git a/c++/src/H5Object.cpp b/c++/src/H5Object.cpp
index 9dafea8..dbfe6f2 100644
--- a/c++/src/H5Object.cpp
+++ b/c++/src/H5Object.cpp
@@ -176,7 +176,7 @@ Attribute H5Object::openAttribute( const H5std_string& name ) const
//--------------------------------------------------------------------------
Attribute H5Object::openAttribute( const unsigned int idx ) const
{
- hid_t attr_id = H5Aopen_by_idx(getId(), ".", H5_INDEX_CRT_ORDER,
+ hid_t attr_id = H5Aopen_by_idx(getId(), ".", H5_INDEX_CRT_ORDER,
H5_ITER_INC, (hsize_t)idx, H5P_DEFAULT, H5P_DEFAULT);
if( attr_id > 0 )
{
@@ -215,7 +215,7 @@ int H5Object::iterateAttrs( attr_operator_t user_op, unsigned *_idx, void *op_da
// call the C library routine H5Aiterate2 to iterate the attributes
hsize_t idx = (hsize_t)*_idx;
- int ret_value = H5Aiterate2(getId(), H5_INDEX_NAME, H5_ITER_INC, &idx,
+ int ret_value = H5Aiterate2(getId(), H5_INDEX_NAME, H5_ITER_INC, &idx,
userAttrOpWrpr, (void *) userData);
// release memory
diff --git a/c++/test/h5cpputil.cpp b/c++/test/h5cpputil.cpp
index 4afde22..5e0f904 100644
--- a/c++/test/h5cpputil.cpp
+++ b/c++/test/h5cpputil.cpp
@@ -112,7 +112,7 @@ void issue_fail_msg(const char* where, int line, const char* file_name,
* different, the function will print out a message and the
* different values. This function is made to reuse the code
* segment that is used in various places throughout
- * the test code. Where the C version of this code segment
+ * the test code. Where the C version of this code segment
* "goto error," this function will return -1.
*
* Return: Success: 0
diff --git a/c++/test/tattr.cpp b/c++/test/tattr.cpp
index fe95fe7..11f7303 100644
--- a/c++/test/tattr.cpp
+++ b/c++/test/tattr.cpp
@@ -1051,7 +1051,7 @@ static void test_attr_dtype_shared()
fid1.openFile(FILENAME, H5F_ACC_RDWR);
// Enclosing to work around the issue of unused variables and/or
- // objects created by copy constructors stay around until end of
+ // objects created by copy constructors stay around until end of
// scope, causing incorrect number of ref counts.
{ // First enclosed block
diff --git a/c++/test/tcompound.cpp b/c++/test/tcompound.cpp
index 9532dd6..2b1879b 100644
--- a/c++/test/tcompound.cpp
+++ b/c++/test/tcompound.cpp
@@ -178,13 +178,13 @@ static void test_compound_2()
s_ptr->e != d_ptr->e) {
H5_FAILED();
cerr << " i=" << i << endl;
- cerr << " src={a=" << s_ptr->a << ", b=" << s_ptr->b
- << "c=[" << s_ptr->c[0] << "," << s_ptr->c[1] << ","
- << s_ptr->c[2] << "," << s_ptr->c[3] << ", d="
+ cerr << " src={a=" << s_ptr->a << ", b=" << s_ptr->b
+ << "c=[" << s_ptr->c[0] << "," << s_ptr->c[1] << ","
+ << s_ptr->c[2] << "," << s_ptr->c[3] << ", d="
<< s_ptr->d << ", e=" << s_ptr->e << "}" << endl;
- cerr << " dst={a=" << s_ptr->a << ", b=" << s_ptr->b
- << "c=[" << s_ptr->c[0] << "," << s_ptr->c[1] << ","
- << s_ptr->c[2] << "," << s_ptr->c[3] << ", d="
+ cerr << " dst={a=" << s_ptr->a << ", b=" << s_ptr->b
+ << "c=[" << s_ptr->c[0] << "," << s_ptr->c[1] << ","
+ << s_ptr->c[2] << "," << s_ptr->c[3] << ", d="
<< s_ptr->d << ", e=" << s_ptr->e << "}" << endl;
}
}
@@ -294,13 +294,13 @@ static void test_compound_3()
s_ptr->e != d_ptr->e) {
H5_FAILED();
cerr << " i=" << i << endl;
- cerr << " src={a=" << s_ptr->a << ", b=" << s_ptr->b
- << ", c=[" << s_ptr->c[0] << "," << s_ptr->c[1] << ","
- << s_ptr->c[2] << "," << s_ptr->c[3] << "], d="
+ cerr << " src={a=" << s_ptr->a << ", b=" << s_ptr->b
+ << ", c=[" << s_ptr->c[0] << "," << s_ptr->c[1] << ","
+ << s_ptr->c[2] << "," << s_ptr->c[3] << "], d="
<< s_ptr->d << ", e=" << s_ptr->e << "}" << endl;
cerr << " dst={a=" << d_ptr->a
- << ", c=[" << d_ptr->c[0] << "," << d_ptr->c[1] << ","
- << d_ptr->c[2] << "," << d_ptr->c[3] << "], e="
+ << ", c=[" << d_ptr->c[0] << "," << d_ptr->c[1] << ","
+ << d_ptr->c[2] << "," << d_ptr->c[3] << "], e="
<< d_ptr->e << "}" << endl;
} // if
} // for
@@ -391,7 +391,7 @@ static void test_compound_4()
st.insertMember("d", HOFFSET(src_typ_t, d), PredType::NATIVE_INT);
st.insertMember("e", HOFFSET(src_typ_t, e), PredType::NATIVE_INT);
array_dt->close();
-
+
array_dt = new ArrayType(PredType::NATIVE_INT, 1, &four);
// Create an empty compound datatype
@@ -402,7 +402,7 @@ static void test_compound_4()
dt.insertMember("d", HOFFSET(dst_typ_t, d), PredType::NATIVE_SHORT);
dt.insertMember("e", HOFFSET(dst_typ_t, e), PredType::NATIVE_INT);
array_dt->close();
-
+
/* Perform the conversion */
st.convert(dt, (size_t)nelmts, buf, bkg);
@@ -421,17 +421,17 @@ static void test_compound_4()
{
H5_FAILED();
cerr << " i=" << i << endl;
- cerr << " src={a=" << s_ptr->a << ", b=" << s_ptr->b
- << "c=[" << s_ptr->c[0] << "," << s_ptr->c[1] << ","
- << s_ptr->c[2] << "," << s_ptr->c[3] << ", d="
+ cerr << " src={a=" << s_ptr->a << ", b=" << s_ptr->b
+ << "c=[" << s_ptr->c[0] << "," << s_ptr->c[1] << ","
+ << s_ptr->c[2] << "," << s_ptr->c[3] << ", d="
<< s_ptr->d << ", e=" << s_ptr->e << "}" << endl;
- cerr << " dst={a=" << d_ptr->a << ", b=" << d_ptr->b
- << "c=[" << d_ptr->c[0] << "," << d_ptr->c[1] << ","
- << d_ptr->c[2] << "," << d_ptr->c[3] << ", d="
+ cerr << " dst={a=" << d_ptr->a << ", b=" << d_ptr->b
+ << "c=[" << d_ptr->c[0] << "," << d_ptr->c[1] << ","
+ << d_ptr->c[2] << "," << d_ptr->c[3] << ", d="
<< d_ptr->d << ", e=" << d_ptr->e << "}" << endl;
} // if
} // for
-
+
/* Release resources */
free(buf);
free(bkg);
@@ -493,13 +493,13 @@ static void test_compound_5()
try {
/* Build datatypes */
- ArrayType* array_dt = new ArrayType(PredType::NATIVE_SHORT, 1, dims);
+ ArrayType* array_dt = new ArrayType(PredType::NATIVE_SHORT, 1, dims);
CompType short_array(4*sizeof(short));
short_array.insertMember("_", 0, *array_dt);
array_dt->close();
CompType int_array(4*sizeof(int));
- array_dt = new ArrayType(PredType::NATIVE_INT, 1, dims);
+ array_dt = new ArrayType(PredType::NATIVE_INT, 1, dims);
int_array.insertMember("_", 0, *array_dt);
array_dt->close();
@@ -532,7 +532,7 @@ static void test_compound_5()
src[1].coll_ids[0]!=dst[1].coll_ids[0] ||
src[1].coll_ids[1]!=dst[1].coll_ids[1] ||
src[1].coll_ids[2]!=dst[1].coll_ids[2] ||
- src[1].coll_ids[3]!=dst[1].coll_ids[3])
+ src[1].coll_ids[3]!=dst[1].coll_ids[3])
{ H5_FAILED(); }
/* Free memory buffers */
@@ -614,17 +614,17 @@ static void test_compound_6()
s_ptr = ((src_typ_t*)orig) + i;
d_ptr = ((dst_typ_t*)buf) + i;
if (s_ptr->b != d_ptr->b ||
- s_ptr->d != d_ptr->d)
+ s_ptr->d != d_ptr->d)
{
H5_FAILED();
cerr << " i=" << i << endl;
- cerr << " src={b=" << s_ptr->b << ", d=" << s_ptr->d
+ cerr << " src={b=" << s_ptr->b << ", d=" << s_ptr->d
<< "}" << endl;
- cerr << " dst={b=" << d_ptr->b << ", d=" << d_ptr->d
+ cerr << " dst={b=" << d_ptr->b << ", d=" << d_ptr->d
<< "}" << endl;
} // if
} // for
-
+
/* Release resources */
free(buf);
free(bkg);
diff --git a/c++/test/tfilter.cpp b/c++/test/tfilter.cpp
index db7e358..2f87feb 100644
--- a/c++/test/tfilter.cpp
+++ b/c++/test/tfilter.cpp
@@ -48,7 +48,7 @@
#define FILTER_CHUNK_DIM2 25
// will do this function later or use it as guideline - BMR - 2007/01/26
-static herr_t test_filter_internal(hid_t fid, const char *name, hid_t dcpl,
+static herr_t test_filter_internal(hid_t fid, const char *name, hid_t dcpl,
int if_fletcher32, int corrupted, hsize_t *dset_size)
{
cerr << "do nothing right now" << endl;
@@ -58,7 +58,7 @@ static herr_t test_filter_internal(hid_t fid, const char *name, hid_t dcpl,
/* Temporary filter IDs used for testing */
#define H5Z_FILTER_BOGUS 305
static size_t filter_bogus(unsigned int flags, size_t cd_nelmts,
- const unsigned int *cd_values, size_t nbytes, size_t *buf_size, void **buf);
+ const unsigned int *cd_values, size_t nbytes, size_t *buf_size, void **buf);
/* This message derives from H5Z */
const H5Z_class_t H5Z_BOGUS[1] = {{
H5Z_CLASS_T_VERS, /* H5Z_class_t version */
@@ -227,7 +227,7 @@ void test_szip_filter(H5File& file1)
{
issue_fail_msg("test_szip_filter()", __LINE__, __FILE__, E.getCDetailMsg());
}
- } // if szip presents
+ } // if szip presents
else {
SKIPPED();
}
diff --git a/c++/test/th5s.cpp b/c++/test/th5s.cpp
index 5a7c678..258e904 100644
--- a/c++/test/th5s.cpp
+++ b/c++/test/th5s.cpp
@@ -300,7 +300,7 @@ static void test_h5s_scalar_write()
verify_val(ext_type, H5S_SCALAR, "DataSpace::getSimpleExtentType", __LINE__, __FILE__);
// Create and write a dataset
- DataSet dataset = fid1.createDataSet("Dataset1", PredType::NATIVE_UINT,sid1);
+ DataSet dataset = fid1.createDataSet("Dataset1", PredType::NATIVE_UINT,sid1);
dataset.write(&space3_data, PredType::NATIVE_UINT);
PASSED();
diff --git a/c++/test/trefer.cpp b/c++/test/trefer.cpp
index 9650a0e..0d9ea4f 100644
--- a/c++/test/trefer.cpp
+++ b/c++/test/trefer.cpp
@@ -190,7 +190,7 @@ static void test_reference_obj()
sid1.close();
dataset.close();
delete file1;
-
+
// Re-open the file
file1 = new H5File(FILE1, H5F_ACC_RDWR);
@@ -198,9 +198,9 @@ static void test_reference_obj()
dataset = file1->openDataSet("/Dataset3");
// Read selection from disk
- dataset.read(rbuf, PredType::STD_REF_OBJ);
+ dataset.read(rbuf, PredType::STD_REF_OBJ);
- // Dereference dataset object by ctor, from the location where
+ // Dereference dataset object by ctor, from the location where
// 'dataset' is located
DataSet dset2(dataset, &rbuf[0]);
@@ -234,14 +234,14 @@ static void test_reference_obj()
verify_val(read_comment2, write_comment, "Group::getComment", __LINE__, __FILE__);
group.close();
- // Dereference group object by ctor and using dataset to specify
+ // Dereference group object by ctor and using dataset to specify
// location
Group new_group(dataset, &rbuf[2]);
H5std_string read_comment3 = new_group.getComment(".", 10);
verify_val(read_comment3, write_comment, "Group::getComment", __LINE__, __FILE__);
group.close();
- // Dereference datatype object from the location where 'dataset'
+ // Dereference datatype object from the location where 'dataset'
// is located
dtype1.dereference(dataset, &rbuf[3]);
diff --git a/c++/test/ttypes.cpp b/c++/test/ttypes.cpp
index c9f70e7..e9c1615 100644
--- a/c++/test/ttypes.cpp
+++ b/c++/test/ttypes.cpp
@@ -121,7 +121,7 @@ static void test_classes()
}
PASSED();
} // end of try block
- catch (Exception E) {
+ catch (Exception E) {
issue_fail_msg("test_classes", __LINE__, __FILE__, E.getCDetailMsg());
}
}
@@ -176,8 +176,8 @@ static void test_copy()
another_int_type = new_int_type;
PASSED();
- }
- catch (Exception E) {
+ }
+ catch (Exception E) {
issue_fail_msg("test_copy", __LINE__, __FILE__, E.getCDetailMsg());
}
}
@@ -189,12 +189,12 @@ static void test_copy()
* Purpose: Tests query functions of compound and enumeration types.
*
* Return: Success: 0
- *
+ *
* Failure: number of errors
*
* Programmer: Binh-Minh Ribler (use C version)
* January, 2007
- *
+ *
* Modifications:
*
*-------------------------------------------------------------------------
@@ -286,7 +286,7 @@ static void test_query()
issue_fail_msg("test_query", __LINE__, __FILE__, E.getCDetailMsg());
}
} // test_query
-
+
/*-------------------------------------------------------------------------
* Function: test_transient
@@ -308,7 +308,7 @@ const char* filename1 = "dtypes1.h5";
static void test_transient ()
{
static hsize_t ds_size[2] = {10, 20};
-
+
SUBTEST("Transient datatypes");
try {
@@ -342,7 +342,7 @@ static void test_transient ()
} catch (DataTypeIException err) {}
itype.close();
- // Get a copy of the dataset's datatype by applying DataType::copy()
+ // Get a copy of the dataset's datatype by applying DataType::copy()
// to the dataset. The resulted datatype should be modifiable.
itype.copy(dset);
itype.setPrecision(256);
@@ -388,7 +388,7 @@ static void test_named ()
static hsize_t ds_size[2] = {10, 20};
hsize_t i;
unsigned attr_data[10][20];
-
+
SUBTEST("Named datatypes");
try {
// Create the file.
@@ -432,7 +432,7 @@ static void test_named ()
// It should be possible to define an attribute for the named type
Attribute attr1 = itype.createAttribute("attr1", PredType::NATIVE_UCHAR, space);
- for (i=0; i<ds_size[0]*ds_size[1]; i++)
+ for (i=0; i<ds_size[0]*ds_size[1]; i++)
attr_data[0][i] = (int)i;/*tricky*/
attr1.write(PredType::NATIVE_UINT, attr_data);
attr1.close();
@@ -449,7 +449,7 @@ static void test_named ()
/*
* Close the committed type and reopen it. It should return a named type.
* This had something to do with the way IntType was returned and assigned
-and caused itype.committed not working correctly. So, use another_type for
+and caused itype.committed not working correctly. So, use another_type for
now.
itype.close();
itype = file.openIntType("native-int");
@@ -470,7 +470,7 @@ now.
dset.close();
ds_type->close();
- // Reopen the dataset and its type, then make sure the type is
+ // Reopen the dataset and its type, then make sure the type is
// a named type.
dset = file.openDataSet("dset1");
ds_type = new DataType(dset.getDataType());
@@ -492,7 +492,7 @@ now.
if (!iscommitted)
throw InvalidActionException("DataType::iscommitted()", "Dataset type should be named type!");
ds_type->close();
-
+
// Get the dataset datatype by applying DataType::copy() to the
// dataset. The resulted datatype should be modifiable.
IntType copied_type;
diff --git a/c++/test/tvlstr.cpp b/c++/test/tvlstr.cpp
index 71b16a6..2c22903 100644
--- a/c++/test/tvlstr.cpp
+++ b/c++/test/tvlstr.cpp
@@ -76,7 +76,7 @@ void *test_vlstr_alloc_custom(size_t size, void *info)
* This weird contortion is required on the DEC Alpha to keep the
* alignment correct - QAK
*/
-
+
extra = MAX(sizeof(void *),sizeof(size_t));
if((ret_value = HDmalloc(extra + size)) != NULL) {
@@ -108,7 +108,7 @@ void test_vlstr_free_custom(void *_mem, void *info)
* This weird contortion is required on the DEC Alpha to keep the
* alignment correct - QAK
*/
-
+
extra=MAX(sizeof(void *),sizeof(size_t));
if(_mem!=NULL) {
@@ -172,7 +172,7 @@ static void test_vlstrings_basic()
dataset2.close();
HDfree(wdata2);
- // Change to the custom memory allocation routines for reading
+ // Change to the custom memory allocation routines for reading
// VL string.
DSetMemXferPropList xfer;
size_t mem_used = 0; // Memory used during allocation
@@ -239,7 +239,7 @@ static void test_vlstrings_basic()
/*-------------------------------------------------------------------------
* Function: test_vlstrings_special
*
- * Purpose: Test VL string code for special string cases, nil and
+ * Purpose: Test VL string code for special string cases, nil and
* zero-sized.
*
* Return: None
@@ -305,11 +305,11 @@ static void test_vlstrings_special()
// Close Dataset.
dataset.close();
- /*
+ /*
* Create another dataset to test nil strings.
*/
- // Create the property list and set the fill value for the second
+ // Create the property list and set the fill value for the second
// dataset.
DSetCreatPropList dcpl;
char *fill = NULL; // Fill value
@@ -594,7 +594,7 @@ static void test_write_vl_string_attribute()
// Open attribute ATTRSTR_NAME again.
gr_attr = root.openAttribute(ATTRSTR_NAME);
- // The attribute string written is freed below, in the
+ // The attribute string written is freed below, in the
// test_read_vl_string_attribute() test
// Close attribute and file
@@ -671,7 +671,7 @@ static void test_read_vl_string_attribute()
} // test_read_vl_string_attribute
/* Helper routine for test_vl_rewrite() */
-static void write_scalar_dset(H5File& file, DataType& type, DataSpace& space,
+static void write_scalar_dset(H5File& file, DataType& type, DataSpace& space,
char *name, char *data)
{
DataSet dset;
@@ -689,7 +689,7 @@ static void write_scalar_dset(H5File& file, DataType& type, DataSpace& space,
}
/* Helper routine for test_vl_rewrite() */
-static void read_scalar_dset(H5File& file, DataType& type, DataSpace& space,
+static void read_scalar_dset(H5File& file, DataType& type, DataSpace& space,
char *name, char *data)
{
char *data_read;