[svn-r19380] Description:

    Minor code cleanups.

Tested on:
    Mac OS X/32 10.6.4 (amazon) w/debug & production
    (h5committest not required on this branch)

1 files changed, 8 insertions, 120 deletions

diff --git a/test/dsets.c b/test/dsets.c
index ae23e7e..15de972 100644
--- a/test/dsets.c
+++ b/test/dsets.c
@@ -285,8 +285,6 @@ const H5Z_class2_t H5Z_COUNT[1] = {{
  * Programmer:  Neil Fortner
  *              Wednesday, March 17, 2010
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static size_t
@@ -315,11 +313,6 @@ filter_count(unsigned int flags, size_t UNUSED cd_nelmts,
  * Programmer:	Robb Matzke
  *		Tuesday, December  9, 1997
  *
- * Modifications:
- *              Added test for compact dataset creation.
- *              Raymond Lu
- *              August 8, 2002
- *
  *-------------------------------------------------------------------------
  */
 static herr_t
@@ -474,8 +467,6 @@ test_create(hid_t file)
  * Programmer:	Robb Matzke
  *		Wednesday, December 10, 1997
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static herr_t
@@ -596,8 +587,6 @@ error:
  * Programmer:	Raymond Lu
  *		Wednesday, November 27, 2002
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static herr_t
@@ -691,8 +680,6 @@ error:
  * Programmer:  Raymond Lu
  *              August 8, 2002
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static herr_t
@@ -1074,8 +1061,6 @@ error:
  * Programmer:	Raymond Lu
  *		Monday, May 12, 2003
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static herr_t
@@ -1222,8 +1207,6 @@ error:
  * Programmer:	Robb Matzke
  *		Wednesday, January 14, 1998
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static herr_t
@@ -1324,8 +1307,6 @@ const H5Z_class2_t H5Z_BOGUS[1] = {{
  * Programmer:	Quincey Koziol
  *              Friday, April  5, 2003
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static htri_t
@@ -1352,8 +1333,6 @@ can_apply_bogus(hid_t UNUSED dcpl_id, hid_t type_id, hid_t UNUSED space_id)
  * Programmer:	Robb Matzke
  *              Tuesday, April 21, 1998
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static size_t
@@ -1378,8 +1357,6 @@ filter_bogus(unsigned int UNUSED flags, size_t UNUSED cd_nelmts,
  * Programmer:	Quincey Koziol
  *              Friday, April  5, 2003
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static herr_t
@@ -1431,8 +1408,6 @@ set_local_bogus2(hid_t dcpl_id, hid_t type_id, hid_t UNUSED space_id)
  * Programmer:	Quincey Koziol
  *              Monday, April  7, 2003
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static size_t
@@ -1489,8 +1464,6 @@ filter_bogus2(unsigned int flags, size_t cd_nelmts,
  * Programmer:	Raymond Lu
  *              4 August 2010
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static size_t
@@ -1587,8 +1560,6 @@ error:
  * Programmer:	Raymond Lu
  *              Jan 14, 2003
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static H5Z_cb_return_t
@@ -1612,8 +1583,6 @@ filter_cb_cont(H5Z_filter_t filter, void UNUSED *buf, size_t UNUSED buf_size,
  * Programmer:	Raymond Lu
  *              Jan 14, 2003
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static H5Z_cb_return_t
@@ -1641,10 +1610,6 @@ filter_cb_fail(H5Z_filter_t filter, void UNUSED *buf, size_t UNUSED buf_size,
  * Programmer:	Robb Matzke
  *              Wednesday, April 15, 1998
  *
- * Modifications:
- *              Moved out of main test_compression routine
- *              Quincey Koziol, November 14, 2002
- *
  *-------------------------------------------------------------------------
  */
 static herr_t
@@ -1991,10 +1956,6 @@ error:
  * Programmer:	Nat Furrer and James Laird
  *              Monday, June 7, 2004
  *
- * Modifications:
- *              Make copy of data file since the test writes to the file.
- *              Larry Knox, October 14, 2009
- *
  *-------------------------------------------------------------------------
  */
 #ifdef H5_HAVE_FILTER_SZIP
@@ -2116,8 +2077,6 @@ error:
  * Programmer:  Nat Furrer and James Laird
  *              Thursday, June 10, 2004
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static herr_t
@@ -2195,14 +2154,6 @@ error:
  * Programmer:	Robb Matzke
  *              Wednesday, April 15, 1998
  *
- * Modifications:
- *              Moved guts of filter testing out of main routine.
- *              Tests shuffle, deflate, fletcher32 checksum filters.
- *              Quincey Koziol, November 14, 2002
- *
- *              Added Fletcher32 filter testing
- *              Raymond Lu, Jan 22, 2002
- *
  *-------------------------------------------------------------------------
  */
 static herr_t
@@ -2738,8 +2689,6 @@ error:
  * Programmer:	Kent Yang
  *              Wednesday, Nov. 13th, 2002
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static herr_t
@@ -2856,8 +2805,6 @@ error:
  * Programmer:  Xiaowen Wu
  *              Wednesday, Dec. 23th, 2004
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static herr_t
@@ -2998,8 +2945,6 @@ error:
  * Programmer:  Xiaowen Wu
  *              Friday, Jan. 21th, 2005
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static herr_t
@@ -3129,8 +3074,6 @@ error:
  * Programmer:  Xiaowen Wu
  *              Wednesday, Jan. 26th, 2005
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static herr_t
@@ -3262,8 +3205,6 @@ error:
  * Programmer:  Xiaowen Wu
  *              Tuesday, Jan. 18th, 2005
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static herr_t
@@ -3410,8 +3351,6 @@ error:
  * Programmer:  Xiaowen Wu
  *              Tuesday, Jan. 18th, 2005
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static herr_t
@@ -3608,8 +3547,6 @@ error:
  * Programmer:  Xiaowen Wu
  *              Tuesday, Jan. 18th, 2005
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static herr_t
@@ -3897,8 +3834,6 @@ error:
  * Programmer:  Xiaowen Wu
  *              Thursday, Mar. 31th, 2005
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static herr_t
@@ -4096,8 +4031,6 @@ error:
  * Programmer:  Xiaowen Wu
  *              Monday, Feb. 14th, 2005
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static herr_t
@@ -4227,8 +4160,6 @@ error:
  * Programmer:  Xiaowen Wu
  *              Tuesday, March 15th, 2005
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static herr_t
@@ -4374,8 +4305,6 @@ error:
  * Programmer:  Xiaowen Wu
  *              Wednesday, Apr. 20th, 2005
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static herr_t
@@ -4506,8 +4435,6 @@ error:
  * Programmer:  Xiaowen Wu
  *              Wednesday, Apr. 20th, 2005
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static herr_t
@@ -4654,8 +4581,6 @@ error:
  * Programmer:  Xiaowen Wu
  *              Monday, Apr. 25th, 2005
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static herr_t
@@ -4786,8 +4711,6 @@ error:
  * Programmer:  Xiaowen Wu
  *              Monday, Apr. 25th, 2005
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static herr_t
@@ -4937,8 +4860,6 @@ error:
  * Programmer:	Robb Matzke
  *              Tuesday, June  9, 1998
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static herr_t
@@ -5003,8 +4924,6 @@ test_multiopen (hid_t file)
  * Programmer:	Robb Matzke
  *              Monday, June  7, 1999
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static herr_t
@@ -6128,8 +6047,6 @@ error:
  * Programmer: Pedro Vicente
  *              Monday, January 26, 2004
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static herr_t
@@ -6257,8 +6174,6 @@ error:
  * Programmer: Pedro Vicente
  *              Monday, March 8, 2004
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static herr_t
@@ -6416,10 +6331,6 @@ error:
  * Programmer: Quincey Koziol
  *              Tuesday, July 27, 2004
  *
- * Modifications:
- *	Vailin Choi; June 2010
- *	Added dataset with > 1 unlimited dimensions to the test.
- *
  *-------------------------------------------------------------------------
  */
 static herr_t
@@ -6439,18 +6350,18 @@ test_zero_dims(hid_t file)
     TESTING("I/O on datasets with zero-sized dims");
 
     /* Get the file's file access property list */
-    if((fapl = H5Fget_access_plist(file)) < 0) TEST_ERROR; 
+    if((fapl = H5Fget_access_plist(file)) < 0) FAIL_STACK_ERROR
 
     /* Get library format */
-    if(H5Pget_libver_bounds(fapl, &low, NULL) < 0) TEST_ERROR;
+    if(H5Pget_libver_bounds(fapl, &low, NULL) < 0) FAIL_STACK_ERROR
 
     /* 
      * One-dimensional dataset 
      */
-    if((s = H5Screate_simple(1, &dsize, &dmax)) < 0) TEST_ERROR;
+    if((s = H5Screate_simple(1, &dsize, &dmax)) < 0) FAIL_STACK_ERROR
 
     /* Try creating chunked dataset with undefined chunk dimensions */
-    if((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0) TEST_ERROR;
+    if((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0) FAIL_STACK_ERROR
     if(H5Pset_layout(dcpl, H5D_CHUNKED) < 0) FAIL_STACK_ERROR
 
     H5E_BEGIN_TRY {
@@ -6476,7 +6387,7 @@ test_zero_dims(hid_t file)
     if((d = H5Dcreate2(file, ZERODIM_DATASET, H5T_NATIVE_INT, s, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR
 
     /* Get the chunk index type */
-    if(H5D_layout_idx_type_test(d, &idx_type) < 0) TEST_ERROR;
+    if(H5D_layout_idx_type_test(d, &idx_type) < 0) FAIL_STACK_ERROR
 
     /* Verify index type */
     if(low == H5F_LIBVER_LATEST) {
@@ -6495,10 +6406,10 @@ test_zero_dims(hid_t file)
     /* 
      * Two-dimensional dataset 
      */
-    if((s2 = H5Screate_simple(2, dsize2, dmax2)) < 0) TEST_ERROR;
+    if((s2 = H5Screate_simple(2, dsize2, dmax2)) < 0) FAIL_STACK_ERROR
 
     /* Try creating chunked dataset with undefined chunk dimensions */
-    if((dcpl2 = H5Pcreate(H5P_DATASET_CREATE)) < 0) TEST_ERROR;
+    if((dcpl2 = H5Pcreate(H5P_DATASET_CREATE)) < 0) FAIL_STACK_ERROR
     if(H5Pset_layout(dcpl2, H5D_CHUNKED) < 0) FAIL_STACK_ERROR
 
     H5E_BEGIN_TRY {
@@ -6526,7 +6437,7 @@ test_zero_dims(hid_t file)
     if((d2 = H5Dcreate2(file, ZERODIM_DATASET2, H5T_NATIVE_INT, s2, H5P_DEFAULT, dcpl2, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR
 
     /* Get the chunk index type */
-    if(H5D_layout_idx_type_test(d2, &idx_type) < 0) TEST_ERROR;
+    if(H5D_layout_idx_type_test(d2, &idx_type) < 0) FAIL_STACK_ERROR
 
     /* Verify index type */
     if(low == H5F_LIBVER_LATEST) {
@@ -6572,10 +6483,6 @@ error:
  * Programmer: Quincey Koziol
  *              Tuesday, August 25, 2004
  *
- * Modifications:
- *	Vailin Choi; June 2010
- *	Added dataset with >1 unlimited dimensions to the test.
- *
  *-------------------------------------------------------------------------
  */
 static herr_t
@@ -6763,10 +6670,6 @@ error:
  * Programmer: Christian Chilan
  *             Monday, March 26, 2007
  *
- * Modifications:
- *	Vailin Choi; June 2010
- *	Added dataset with >1 unlimited dimensions to the test.
- *
  *-------------------------------------------------------------------------
  */
 static herr_t
@@ -7542,9 +7445,6 @@ error:
  * Programmer:  Raymond Lu
  *              11 Feb 2009
  *
- * Modifications:
- *	Vailin Choi; June 2010
- *	Added 2-D dataset with unlimited dimensions to the test.
  *-------------------------------------------------------------------------
  */
 static herr_t
@@ -8337,10 +8237,6 @@ filter_expand(unsigned int flags, size_t UNUSED cd_nelmts,
  * Programmer:  Quincey Koziol
  *              Tuesday, March 31, 2009
  *
- * Modifications:
- *	Vailin Choi; June 2010
- *	Added 2-D dataset with unlimited dimensions to the test.
- *
  *-------------------------------------------------------------------------
  */
 static herr_t
@@ -8748,12 +8644,6 @@ error:
  *
  * Programmer:  Vailin Choi; 2009
  *
- * Modifications:
- *      Vailin Choi; June 2010
- *      Made changes to verify that Fixed Array indexing is used also for
- *      extendible chunked dataset.
- *	(fixed max. dim. setting but exclude H5S_UNLIMITED)
- *
  *-------------------------------------------------------------------------
  */
 static herr_t
@@ -9335,8 +9225,6 @@ error:
  * Programmer:	Robb Matzke
  *		Tuesday, December  9, 1997
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 int