[svn-r4517]

Purpose:
    Changed to the new generic property list for dataset creation property
    list.
Platforms tested:
    Arabica, modi4 and Hawkwind

3 files changed, 12 insertions, 11 deletions

diff --git a/tools/h4toh5/h4toh5image.c b/tools/h4toh5/h4toh5image.c
index fd32405..c4c945f 100644
--- a/tools/h4toh5/h4toh5image.c
+++ b/tools/h4toh5/h4toh5image.c
@@ -424,7 +424,7 @@ int Image_h4_to_h5(int32 file_id,int32 ri_id,hid_t h5_group,hid_t h5_palgroup,in
  By default, we will compress HDF5 dataset by using gzip compression if HDF5 file is compressed. */
 
   /* we don't use data transfer property list. 
- write_plist = H5Pcreate_list(H5P_DATASET_XFER_NEW);
+ write_plist = H5Pcreate(H5P_DATASET_XFER);
  bufsize = h4memsize *h5dims[1]*ncomp;
 
   if(H5Pset_buffer(write_plist,bufsize,NULL,NULL)<0) {
diff --git a/tools/h4toh5/h4toh5sds.c b/tools/h4toh5/h4toh5sds.c
index 28c87f4..4e2a9d9 100644
--- a/tools/h4toh5/h4toh5sds.c
+++ b/tools/h4toh5/h4toh5sds.c
@@ -84,7 +84,7 @@ int Sds_h4_to_h5(int32 file_id,int32 sds_id,hid_t h5_group,hid_t h5_dimgroup,int
   int16           special_code;
   int32           access_id;
   uint16          sd_ref;
-  int             gzip_level;
+ int             gzip_level;
   /* define varibles for hdf5. */
 
   hid_t   h5dset;
@@ -443,9 +443,7 @@ int Sds_h4_to_h5(int32 file_id,int32 sds_id,hid_t h5_group,hid_t h5_dimgroup,int
     return FAIL;							      
   }									      
   /* comment this out.
-     write_plist = H5Pcreate(H5P_DATASET_XFER);
-
-  write_plist = H5Pcreate_list(H5P_DATASET_XFER_NEW);
+  write_plist = H5Pcreate(H5P_DATASET_XFER);
   bufsize = h4memsize;
   for(i=1;i<sds_rank;i++)
     bufsize *= h5dims[i];
@@ -458,7 +456,7 @@ int Sds_h4_to_h5(int32 file_id,int32 sds_id,hid_t h5_group,hid_t h5_dimgroup,int
     free(chunk_dims);
     H5Sclose(h5d_sid);
     H5Pclose(create_plist);
-    H5Pclose_list(write_plist);
+    H5Pclose(write_plist);
     return FAIL;		
   }
   if (H5Dwrite(h5dset,h5_memtype,h5d_sid,h5d_sid,write_plist,	    
@@ -1482,7 +1480,7 @@ int convert_sdsfillvalue(int32 file_id,int32 sds_id,hid_t h5_group,hid_t h5_dimg
    chunk_dims   = malloc(sizeof(hsize_t)*sds_rank);
 
   if(chunk_dims == NULL) {
-    H5Pclose(H5P_DATASET_CREATE);
+    H5Pclose(create_plist);
     free(sds_start);
     free(sds_edge);
     free(sds_stride);
@@ -1529,7 +1527,7 @@ int convert_sdsfillvalue(int32 file_id,int32 sds_id,hid_t h5_group,hid_t h5_dimg
   }									      
   /* Before HDF5 library make the optimzation of dealing with fill value
      data, leave this alone. */
-  /*  write_plist = H5Pcreate_list(H5P_DATASET_XFER_NEW);
+  /*  write_plist = H5Pcreate(H5P_DATASET_XFER);
   bufsize = h4memsize;
   for(i=1;i<sds_rank;i++)
     bufsize *= h5dims[i];
@@ -1542,7 +1540,7 @@ int convert_sdsfillvalue(int32 file_id,int32 sds_id,hid_t h5_group,hid_t h5_dimg
      free(chunk_dims);
     H5Sclose(h5d_sid);
     H5Pclose(create_plist);
-    H5Pclose_list(write_plist);
+    H5Pclose(write_plist);
     return FAIL;		
   }
 
@@ -1553,7 +1551,7 @@ int convert_sdsfillvalue(int32 file_id,int32 sds_id,hid_t h5_group,hid_t h5_dimg
     H5Sclose(h5d_sid);
     H5Dclose(h5dset);
     H5Pclose(create_plist);
-    H5Pclose_list(write_plist);
+    H5Pclose(write_plist);
     free(sds_start);
     free(sds_edge);
     free(sds_stride);
@@ -1677,7 +1675,7 @@ int convert_sdsfillvalue(int32 file_id,int32 sds_id,hid_t h5_group,hid_t h5_dimg
   H5Sclose(h5d_sid);
   H5Dclose(h5dset);
   H5Pclose(create_plist);
-/*  H5Pclose_list(write_plist); */
+/*  H5Pclose(write_plist); */
   return SUCCEED;
 }
 
diff --git a/tools/h5dump/h5dumptst.c b/tools/h5dump/h5dumptst.c
index 7d63e9f..9ad987f 100644
--- a/tools/h5dump/h5dumptst.c
+++ b/tools/h5dump/h5dumptst.c
@@ -215,6 +215,7 @@ static void test_dataset2(void)
 
     H5Sclose(space);
     H5Dclose(dataset);
+    H5Pclose(create_plist);
     H5Fclose(fid);
 }
 
@@ -705,6 +706,7 @@ static void test_compound_dt2(void) {       /* test compound data type */
   H5Dclose(dataset);
   H5Sclose(space);
   H5Gclose(group);
+  H5Pclose(create_plist);
 
   H5Fclose(fid);
 
@@ -1089,6 +1091,7 @@ static void test_many(void) {
   group = H5Gopen(fid, "/g5");
   H5Glink (group, H5G_LINK_SOFT, "/g6/dset3", "slink4");
   H5Gclose(group);
+  H5Pclose(create_plist);
 
   H5Fclose(fid);