diff options
author | Quincey Koziol <koziol@hdfgroup.org> | 2007-10-11 16:24:11 (GMT) |
---|---|---|
committer | Quincey Koziol <koziol@hdfgroup.org> | 2007-10-11 16:24:11 (GMT) |
commit | d9e5ca72f39934531b534524d07cf784c3d0e613 (patch) | |
tree | 1913b13a317132523091035f1175b2291c8b9db7 /test/gen_new_fill.c | |
parent | 053807fa81579e6bd9ac6a701ddcaac39e4d0b87 (diff) | |
download | hdf5-d9e5ca72f39934531b534524d07cf784c3d0e613.zip hdf5-d9e5ca72f39934531b534524d07cf784c3d0e613.tar.gz hdf5-d9e5ca72f39934531b534524d07cf784c3d0e613.tar.bz2 |
[svn-r14199] Description:
Add H5Dcreate to API versioned routines, replacing internal usage with
H5Dcreate2
Fix thread-safe error stack initialization for API versioned error
stack printing routines.
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
Diffstat (limited to 'test/gen_new_fill.c')
-rw-r--r-- | test/gen_new_fill.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/test/gen_new_fill.c b/test/gen_new_fill.c index 8f0aa45..4ba85ad 100644 --- a/test/gen_new_fill.c +++ b/test/gen_new_fill.c @@ -39,40 +39,40 @@ main(void) int fill_val1 = 4444, fill_val2=5555; if((file=H5Fcreate(FILENAME, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) <0) goto error; - if((space=H5Screate_simple(2, cur_size, cur_size))<0) goto error; - if((dcpl=H5Pcreate(H5P_DATASET_CREATE))<0) goto error; + if((space=H5Screate_simple(2, cur_size, cur_size)) < 0) goto error; + if((dcpl=H5Pcreate(H5P_DATASET_CREATE)) < 0) goto error; /* Create a dataset with space being allocated and fill value written */ if(H5Pset_alloc_time(dcpl, H5D_ALLOC_TIME_EARLY) < 0) goto error; if(H5Pset_fill_time(dcpl, H5D_FILL_TIME_ALLOC) < 0) goto error; - if(H5Pset_fill_value(dcpl, H5T_NATIVE_INT, &fill_val1)<0) goto error; - if((dset1 = H5Dcreate(file, "dset1", H5T_NATIVE_INT, space, dcpl))<0) + if(H5Pset_fill_value(dcpl, H5T_NATIVE_INT, &fill_val1) < 0) goto error; + if((dset1 = H5Dcreate2(file, "dset1", H5T_NATIVE_INT, space, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0) goto error; - if (H5Dget_space_status(dset1, &allocation)<0) goto error; - if (allocation == H5D_SPACE_STATUS_NOT_ALLOCATED) { + if(H5Dget_space_status(dset1, &allocation) < 0) goto error; + if(allocation == H5D_SPACE_STATUS_NOT_ALLOCATED) { puts(" Got unallocated space instead of allocated."); printf(" Got %d\n", allocation); goto error; } - if(H5Dclose(dset1)<0) goto error; + if(H5Dclose(dset1) < 0) goto error; /* Create a dataset with space allocation being delayed */ if(H5Pset_alloc_time(dcpl, H5D_ALLOC_TIME_LATE) < 0) goto error; if(H5Pset_fill_time(dcpl, H5D_FILL_TIME_ALLOC) < 0) goto error; - if(H5Pset_fill_value(dcpl, H5T_NATIVE_INT, &fill_val2)<0) goto error; - if((dset2 = H5Dcreate(file, "dset2", H5T_NATIVE_INT, space, dcpl))<0) + if(H5Pset_fill_value(dcpl, H5T_NATIVE_INT, &fill_val2) < 0) goto error; + if((dset2 = H5Dcreate2(file, "dset2", H5T_NATIVE_INT, space, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0) goto error; - if (H5Dget_space_status(dset2, &allocation)<0) goto error; - if (allocation != H5D_SPACE_STATUS_NOT_ALLOCATED) { + if(H5Dget_space_status(dset2, &allocation) < 0) goto error; + if(allocation != H5D_SPACE_STATUS_NOT_ALLOCATED) { puts(" Got allocated space instead of unallocated."); printf(" Got %d\n", allocation); goto error; } - if(H5Dclose(dset2)<0) goto error; + if(H5Dclose(dset2) < 0) goto error; - if(H5Sclose(space)<0) goto error; - if(H5Pclose(dcpl)<0) goto error; - if(H5Fclose(file)<0) goto error; + if(H5Sclose(space) < 0) goto error; + if(H5Pclose(dcpl) < 0) goto error; + if(H5Fclose(file) < 0) goto error; return 0; |