mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-03-13 16:47:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

[svn-r18331] Description:

Browse Source 
Update to use H5Gcreate2 instead of H5Gcreate.
    Remove mis-used type related code.

Tested:
    jam, amani and linew
This commit is contained in:
Jonathan Kim 2010-02-24 16:08:02 -05:00
parent a3e8a52f17
commit 9f514c2b7d
1 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
tools/h5copy/h5copygentest.c
View File

@ -410,7 +410,7 @@ static void gent_nested_group(hid_t loc_id)
*------------------------------------------------------------------------*/
static herr_t gen_obj_ref(hid_t loc_id)
{
hid_t sid=0, tid=0, oid=0;
hid_t sid=0, oid=0;
hsize_t dims1[1]={3};
hsize_t dims2[1]={2};
int data[3] = {10,20,30};
@ -427,15 +427,7 @@ static herr_t gen_obj_ref(hid_t loc_id)
goto out;
}
tid = H5Tcopy(H5T_NATIVE_INT);
if (tid < 0)
{
fprintf(stderr, "Error: %s %d> H5Tcopy failed.\n", __FUNCTION__, __LINE__);
ret = FAIL;
goto out;
}
oid = H5Dcreate2 (loc_id, OBJ_REF_DS, tid, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
oid = H5Dcreate2 (loc_id, OBJ_REF_DS, H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
if (oid < 0)
{
fprintf(stderr, "Error: %s %d> H5Dcreate2 failed.\n", __FUNCTION__, __LINE__);
@ -443,7 +435,7 @@ static herr_t gen_obj_ref(hid_t loc_id)
goto out;
}
status = H5Dwrite(oid, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, data);
status = H5Dwrite(oid, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, data);
if (status < 0)
{
fprintf(stderr, "Error: %s %d> H5Dwrite failed.\n", __FUNCTION__, __LINE__);
@ -452,15 +444,14 @@ static herr_t gen_obj_ref(hid_t loc_id)
}
H5Dclose(oid);
H5Tclose(tid);
H5Sclose(sid);
/*--------------
* add group */
oid = H5Gcreate (loc_id, OBJ_REF_GRP, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
oid = H5Gcreate2 (loc_id, OBJ_REF_GRP, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
if (oid < 0)
{
fprintf(stderr, "Error: %s %d> H5Gcreate failed.\n", __FUNCTION__, __LINE__);
fprintf(stderr, "Error: %s %d> H5Gcreate2 failed.\n", __FUNCTION__, __LINE__);
ret = FAIL;
goto out;
}
@ -515,8 +506,6 @@ out:
H5Dclose(oid);
if(sid > 0)
H5Sclose(sid);
if(tid > 0)
H5Tclose(tid);
return ret;
}