[svn-r14192] Description:

	Deprecate H5Dextend in favor of H5Dset_extent (without using API
versioning, due to changed behavior) and switch internal usage to H5Dset_extent

Tested on:
        FreeBSD/32 6.2 (duty) in debug mode
        FreeBSD/64 6.2 (liberty) w/C++ & FORTRAN, in debug mode
        Linux/32 2.6 (kagiso) w/PGI compilers, w/C++ & FORTRAN, w/threadsafe,
                                in debug mode
        Linux/64-amd64 2.6 (smirom) w/default API=1.6.x, w/C++ & FORTRAN,
                                in production mode
        Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN,
                                in production mode
        Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
                                w/szip filter, in production mode
        Mac OS X/32 10.4.10 (amazon) in debug mode

1 files changed, 167 insertions, 69 deletions

diff --git a/test/extend.c b/test/extend.c
index 5433b44..64037fa 100644
--- a/test/extend.c
+++ b/test/extend.c
@@ -31,7 +31,7 @@ const char *FILENAME[] = {
 #define NY	100		/* USE AN EVEN NUMBER!*/
 
 /* Data buffers */
-static int			buf1[NY][NX], buf2[NX/2][NY/2];
+static int			buf1[NY][NX], buf2[NX / 2][NY / 2];
 
 
 /*-------------------------------------------------------------------------
@@ -45,8 +45,6 @@ static int			buf1[NY][NX], buf2[NX/2][NY/2];
  * Programmer:	Quincey Koziol
  *              Tuesday, June 10, 2003
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static int
@@ -54,80 +52,172 @@ write_data(const char *msg, hid_t file, const char *name, hid_t cparms, hid_t me
 {
     hid_t			dataset, file_space, half_space;
     static const hsize_t 	dims[2] = {NX, NY};
-    static const hsize_t 	half_dims[2] = {NX/2, NY/2};
+    static const hsize_t 	half_dims[2] = {NX / 2, NY / 2};
+    hsize_t		        size[2];
+    hsize_t		        max_size[2] = {0, 0};
+    hsize_t			offset[2];
+    int				i, j, k, m;
+
+    TESTING(msg);
+
+    /* Create the dataset */
+    if((dataset = H5Dcreate(file, name, H5T_NATIVE_INT, mem_space, cparms)) < 0) TEST_ERROR;
+
+    /* Write the data */
+    for(i = 0; i < 5; i++)
+	for(j = 0; j < 5; j++) {
+
+	    /* Extend the dataset */
+	    offset[0] = i * NX;
+	    offset[1] = j * NY;
+	    size[0] = offset[0] + NX;
+	    size[1] = offset[1] + NY;
+            if(size[0] > max_size[0] || size[1] > max_size[1]) {
+                if(size[0] > max_size[0])
+                    max_size[0] = size[0];
+                if(size[1] > max_size[1])
+                    max_size[1] = size[1];
+                if(H5Dset_extent(dataset, max_size) < 0) TEST_ERROR;
+            } /* end if */
+
+	    /* Select a hyperslab */
+            if((file_space = H5Dget_space(dataset)) < 0) TEST_ERROR;
+	    if(H5Sselect_hyperslab(file_space, H5S_SELECT_SET, offset, NULL, dims, NULL) < 0) TEST_ERROR;
+
+	    /* Write to the hyperslab */
+	    if(H5Dwrite(dataset, H5T_NATIVE_INT, mem_space, file_space, H5P_DEFAULT, buf1) < 0) TEST_ERROR;
+            if(H5Sclose(file_space) < 0) TEST_ERROR;
+	} /* end for */
+
+    /* Read the data */
+    if((half_space = H5Screate_simple(2, half_dims, NULL)) < 0) TEST_ERROR;
+    if((file_space = H5Dget_space(dataset)) < 0) TEST_ERROR;
+    for(i = 0; i < 10; i++) {
+	for(j = 0; j < 10; j++) {
+
+	    /* Select a hyperslab */
+	    offset[0] = i * (NX / 2);
+	    offset[1] = j * (NY / 2);
+	    if(H5Sselect_hyperslab(file_space, H5S_SELECT_SET, offset, NULL, half_dims, NULL) < 0) TEST_ERROR;
+
+	    /* Read */
+	    if(H5Dread(dataset, H5T_NATIVE_INT, half_space, file_space, H5P_DEFAULT, buf2) < 0) TEST_ERROR;
+
+	    /* Compare */
+	    for(k = 0; k < (NX / 2); k++)
+		for(m = 0; m < (NY / 2); m++)
+		    if(buf2[k][m] != buf1[(i % 2) * (NX / 2) + k][(j % 2) * (NY / 2) + m]) {
+			printf("    i=%d, j=%d, k=%d, m=%d\n", i, j, k, m);
+			printf("    buf2[%d][%d]=%d\n", k, m, buf2[k][m]);
+			printf("    buf1[%d][%d]=%d\n", (i % 2) * (NX / 2) + k, (j % 2) * (NY / 2) + m, buf1[(i % 2) * (NX / 2) + k][(j % 2) * (NY / 2) + m]);
+			TEST_ERROR;
+		    } /* end if */
+	} /* end for */
+    } /* end for */
+
+
+    /* Cleanup */
+    if(H5Dclose(dataset) < 0) TEST_ERROR;
+    if(H5Sclose(file_space) < 0) TEST_ERROR;
+    if(H5Sclose(half_space) < 0) TEST_ERROR;
+
+    PASSED();
+    return 0;
+
+error:
+    return -1;
+} /* end write_data() */
+
+#ifndef H5_NO_DEPRECATED_SYMBOLS
+
+/*-------------------------------------------------------------------------
+ * Function:	write_data_deprec
+ *
+ * Purpose:	Create extendible dataset and test extend/write/read, with
+ *              deprecated API routine (H5Dextend)
+ *
+ * Return:	Success:	0
+ *		Failure:	-1
+ *
+ * Programmer:	Quincey Koziol
+ *              Monday, October 8, 2007
+ *
+ *-------------------------------------------------------------------------
+ */
+static int
+write_data_deprec(const char *msg, hid_t file, const char *name, hid_t cparms, hid_t mem_space)
+{
+    hid_t			dataset, file_space, half_space;
+    static const hsize_t 	dims[2] = {NX, NY};
+    static const hsize_t 	half_dims[2] = {NX / 2, NY / 2};
     static hsize_t		size[2];
     hsize_t			offset[2];
     int				i, j, k, m;
 
     TESTING(msg);
 
-    if ((dataset = H5Dcreate (file, name, H5T_NATIVE_INT, mem_space,
-			      cparms))<0) TEST_ERROR;
+    /* Create the dataset */
+    if((dataset = H5Dcreate(file, name, H5T_NATIVE_INT, mem_space, cparms)) < 0) TEST_ERROR;
+
     /* Write the data */
-    for (i=0; i<5; i++) {
-	for (j=0; j<5; j++) {
+    for(i = 0; i < 5; i++)
+	for(j = 0; j < 5; j++) {
 
 	    /* Extend the dataset */
 	    offset[0] = i * NX;
 	    offset[1] = j * NY;
 	    size[0] = offset[0] + NX;
 	    size[1] = offset[1] + NY;
-	    if (H5Dextend (dataset, size)<0) TEST_ERROR;
+	    if(H5Dextend(dataset, size) < 0) TEST_ERROR;
 
 	    /* Select a hyperslab */
-            if ((file_space = H5Dget_space (dataset))<0) TEST_ERROR;
-	    if (H5Sselect_hyperslab (file_space, H5S_SELECT_SET, offset,
-				     NULL, dims, NULL)<0) TEST_ERROR;
+            if((file_space = H5Dget_space(dataset)) < 0) TEST_ERROR;
+	    if(H5Sselect_hyperslab(file_space, H5S_SELECT_SET, offset, NULL, dims, NULL) < 0) TEST_ERROR;
 
 	    /* Write to the hyperslab */
-	    if (H5Dwrite (dataset, H5T_NATIVE_INT, mem_space, file_space,
-			  H5P_DEFAULT, buf1)<0) TEST_ERROR;
-            if (H5Sclose (file_space)<0) TEST_ERROR;
-	}
-    }
+	    if(H5Dwrite(dataset, H5T_NATIVE_INT, mem_space, file_space, H5P_DEFAULT, buf1) < 0) TEST_ERROR;
+            if(H5Sclose(file_space) < 0) TEST_ERROR;
+	} /* end for */
 
     /* Read the data */
-    if ((half_space = H5Screate_simple (2, half_dims, NULL))<0) TEST_ERROR;
-    if ((file_space = H5Dget_space (dataset))<0) TEST_ERROR;
-    for (i=0; i<10; i++) {
-	for (j=0; j<10; j++) {
+    if((half_space = H5Screate_simple(2, half_dims, NULL)) < 0) TEST_ERROR;
+    if((file_space = H5Dget_space(dataset)) < 0) TEST_ERROR;
+    for(i = 0; i < 10; i++) {
+	for(j = 0; j < 10; j++) {
 
 	    /* Select a hyperslab */
-	    offset[0] = i * NX/2;
-	    offset[1] = j * NY/2;
-	    if (H5Sselect_hyperslab (file_space, H5S_SELECT_SET, offset,
-				     NULL, half_dims, NULL)<0) TEST_ERROR;
+	    offset[0] = i * (NX / 2);
+	    offset[1] = j * (NY / 2);
+	    if(H5Sselect_hyperslab(file_space, H5S_SELECT_SET, offset, NULL, half_dims, NULL) < 0) TEST_ERROR;
 
 	    /* Read */
-	    if (H5Dread (dataset, H5T_NATIVE_INT, half_space, file_space,
-			 H5P_DEFAULT, buf2)<0) TEST_ERROR;
+	    if(H5Dread(dataset, H5T_NATIVE_INT, half_space, file_space, H5P_DEFAULT, buf2) < 0) TEST_ERROR;
 
 	    /* Compare */
-	    for (k=0; k<NX/2; k++) {
-		for (m=0; m<NY/2; m++) {
-		    if (buf2[k][m]!=buf1[(i%2)*NX/2+k][(j%2)*NY/2+m]) {
+	    for(k = 0; k < (NX / 2); k++)
+		for(m = 0; m < (NY / 2); m++)
+		    if(buf2[k][m] != buf1[(i % 2) * (NX / 2) + k][(j % 2) * (NY / 2) + m]) {
 			printf("    i=%d, j=%d, k=%d, m=%d\n", i, j, k, m);
-			printf("    buf2[%d][%d]=%d\n",k,m,buf2[k][m]);
-			printf("    buf1[%d][%d]=%d\n",(i%2)*NX/2+k,(j%2)*NY/2+m,buf1[(i%2)*NX/2+k][(j%2)*NY/2+m]);
+			printf("    buf2[%d][%d]=%d\n", k, m, buf2[k][m]);
+			printf("    buf1[%d][%d]=%d\n", (i % 2) * (NX / 2) + k, (j % 2) * (NY / 2) + m, buf1[(i % 2) * (NX / 2) + k][(j % 2) * (NY / 2) + m]);
 			TEST_ERROR;
-		    }
-		}
-	    }
-	}
-    }
+		    } /* end if */
+	} /* end for */
+    } /* end for */
 
 
     /* Cleanup */
-    if (H5Dclose (dataset)<0) TEST_ERROR;
-    if (H5Sclose (file_space)<0) TEST_ERROR;
-    if (H5Sclose (half_space)<0) TEST_ERROR;
+    if(H5Dclose(dataset) < 0) TEST_ERROR;
+    if(H5Sclose(file_space) < 0) TEST_ERROR;
+    if(H5Sclose(half_space) < 0) TEST_ERROR;
 
     PASSED();
     return 0;
 
 error:
     return -1;
-}
+} /* end write_data_deprec() */
+#endif /* H5_NO_DEPRECATED_SYMBOLS */
 
 
 /*-------------------------------------------------------------------------
@@ -164,51 +254,59 @@ main (void)
     const char *envval = NULL;
 
     envval = HDgetenv("HDF5_DRIVER");
-    if (envval == NULL) 
+    if(envval == NULL) 
         envval = "nomatch";
-    if (HDstrcmp(envval, "split")) {
+    if(HDstrcmp(envval, "split")) {
 	h5_reset();
 	fapl = h5_fileaccess();
 
 	/* Initialize buffer and space */
-	for (i=0; i<NX; i++) {
-	    for (j=0; j<NY; j++) {
-		buf1[i][j] = i*NY+j;
-	    }
-	}
-	if ((mem_space = H5Screate_simple (2, dims, maxdims))<0) TEST_ERROR;
+	for(i = 0; i < NX; i++)
+	    for(j = 0; j < NY; j++)
+		buf1[i][j] = i * NY + j;
+
+	if((mem_space = H5Screate_simple(2, dims, maxdims)) < 0) TEST_ERROR;
 
 	/* Create the file */
 	h5_fixname(FILENAME[0], fapl, filename, sizeof filename);
-	if ((file = H5Fcreate (filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl))<0) TEST_ERROR;
+	if((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) TEST_ERROR;
+
+	/* Create the dataset creation property list */
+	if((cparms = H5Pcreate(H5P_DATASET_CREATE)) < 0) TEST_ERROR;
+	if(H5Pset_chunk(cparms, 2, chunk_dims) < 0) TEST_ERROR;
 
-	/* Create the dataset which is originally NX by NY */
-	if((cparms = H5Pcreate(H5P_DATASET_CREATE))<0) TEST_ERROR;
-	if (H5Pset_chunk (cparms, 2, chunk_dims)<0) TEST_ERROR;
-	nerrors += write_data("extendible dataset with incremental allocation",file,"dataset1",cparms,mem_space)<0 	?1:0;
-	if(H5Pset_alloc_time(cparms, H5D_ALLOC_TIME_EARLY)<0) TEST_ERROR;
-	nerrors += write_data("extendible dataset with early allocation",file,"dataset2",cparms,mem_space)<0 	?1:0;
+        /* Test with incremental allocation */
+	nerrors += write_data("extendible dataset with incr. allocation", file, "dataset1a", cparms, mem_space) < 0 ? 1 : 0;
+#ifndef H5_NO_DEPRECATED_SYMBOLS
+	nerrors += write_data_deprec("extendible dataset with incr. allocation w/deprec. symbols", file, "dataset1b", cparms, mem_space) < 0 ? 1 : 0;
+#endif /* H5_NO_DEPRECATED_SYMBOLS */
 
-	if (H5Pclose (cparms)<0) TEST_ERROR;
-	if (H5Sclose (mem_space)<0) TEST_ERROR;
+        /* Test with early allocation */
+	if(H5Pset_alloc_time(cparms, H5D_ALLOC_TIME_EARLY) < 0) TEST_ERROR;
+	nerrors += write_data("extendible dataset with early allocation", file, "dataset2a", cparms, mem_space) < 0 ? 1 : 0;
+#ifndef H5_NO_DEPRECATED_SYMBOLS
+	nerrors += write_data_deprec("extendible dataset with early allocation w/deprec. symbols", file, "dataset2b", cparms, mem_space) < 0 ? 1 : 0;
+#endif /* H5_NO_DEPRECATED_SYMBOLS */
 
-	if (H5Fclose (file)<0) TEST_ERROR;
-	if (nerrors) {
-	    printf("***** %d FAILURE%s! *****\n", nerrors, 1==nerrors?"":"S");
+	if(H5Pclose(cparms) < 0) TEST_ERROR;
+	if(H5Sclose(mem_space) < 0) TEST_ERROR;
+	if(H5Fclose(file) < 0) TEST_ERROR;
+
+	if(nerrors) {
+	    printf("***** %d FAILURE%s! *****\n", nerrors, (1 == nerrors) ? "" : "S");
 	    exit(1);
-	}
+	} /* end if */
+
 	printf("All extend tests passed.\n");
 	h5_cleanup(FILENAME, fapl);
-    }
+    } /* end if */
     else
-    {
         puts("All extend tests skipped - Incompatible with current Virtual File Driver");
-    }
-    return 0;
 
-    error:
-        printf("*** One or more extend tests failed ***\n");
-        return 1;
+    return 0;
 
+error:
+    printf("*** One or more extend tests failed ***\n");
+    return 1;
 }