diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2007-09-14 01:52:38 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2007-09-14 01:52:38 (GMT) |
| commit | 94153c6c3d776ac172f5151155acee6b64131526 (patch) | |
| tree | 456c655e4a1cb0931956b5a961d4f8e805c40578 /test/objcopy.c | |
| parent | be12aa63a0a210da111b0d31dde44c2c665c7165 (diff) | |
| download | hdf5-94153c6c3d776ac172f5151155acee6b64131526.zip hdf5-94153c6c3d776ac172f5151155acee6b64131526.tar.gz hdf5-94153c6c3d776ac172f5151155acee6b64131526.tar.bz2 | |
[svn-r14148] Description:
Add H5Rget_obj_type() to the API versioning and switch internal
routines to use H5Rget_obj_type2()
Misc. other code cleanups, etc.
Tested on:
FreeBSD/32 6.2 (duty)
FreeBSD/64 6.2 (liberty)
Linux/32 2.6 (kagiso)
Linux/64 2.6 (smirom)
AIX/32 5.3 (copper)
Solaris/32 2.10 (linew)
Mac OS X/32 10.4.10 (amazon)
Diffstat (limited to 'test/objcopy.c')
| -rwxr-xr-x | test/objcopy.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/test/objcopy.c b/test/objcopy.c index c916f8f..d6740a4 100755 --- a/test/objcopy.c +++ b/test/objcopy.c @@ -876,11 +876,11 @@ compare_data(hid_t parent1, hid_t parent2, hid_t pid, hid_t tid, size_t nelmts, ref_buf2 = buf2; for(u = 0; u < nelmts; u++, ref_buf1++, ref_buf2++) { hid_t obj1_id, obj2_id; /* IDs for objects referenced */ - H5G_obj_t obj1_type, obj2_type; /* Types of objects referenced */ + H5O_type_t obj1_type, obj2_type; /* Types of objects referenced */ /* Check for types of objects handled */ - if((obj1_type = H5Rget_obj_type(parent1, H5R_OBJECT, ref_buf1)) < 0) TEST_ERROR - if((obj2_type = H5Rget_obj_type(parent2, H5R_OBJECT, ref_buf2)) < 0) TEST_ERROR + if(H5Rget_obj_type2(parent1, H5R_OBJECT, ref_buf1, &obj1_type) < 0) TEST_ERROR + if(H5Rget_obj_type2(parent2, H5R_OBJECT, ref_buf2, &obj2_type) < 0) TEST_ERROR if(obj1_type != obj2_type) TEST_ERROR /* Open referenced objects */ @@ -903,15 +903,15 @@ compare_data(hid_t parent1, hid_t parent2, hid_t pid, hid_t tid, size_t nelmts, /* Check for types of objects handled */ switch(obj1_type) { - case H5G_DATASET: + case H5O_TYPE_DATASET: if(compare_datasets(obj1_id, obj2_id, pid, NULL) != TRUE) TEST_ERROR break; - case H5G_GROUP: + case H5O_TYPE_GROUP: if(compare_groups(obj1_id, obj2_id, pid, -1, 0) != TRUE) TEST_ERROR break; - case H5G_TYPE: + case H5O_TYPE_NAMED_DATATYPE: if(H5Tequal(obj1_id, obj2_id) != TRUE) TEST_ERROR break; @@ -933,11 +933,11 @@ compare_data(hid_t parent1, hid_t parent2, hid_t pid, hid_t tid, size_t nelmts, for(u = 0; u < nelmts; u++, ref_buf1++, ref_buf2++) { hid_t obj1_id, obj2_id; /* IDs for objects referenced */ hid_t obj1_sid, obj2_sid; /* Dataspace IDs for objects referenced */ - H5G_obj_t obj1_type, obj2_type; /* Types of objects referenced */ + H5O_type_t obj1_type, obj2_type; /* Types of objects referenced */ /* Check for types of objects handled */ - if((obj1_type = H5Rget_obj_type(parent1, H5R_DATASET_REGION, ref_buf1)) < 0) TEST_ERROR - if((obj2_type = H5Rget_obj_type(parent2, H5R_DATASET_REGION, ref_buf2)) < 0) TEST_ERROR + if(H5Rget_obj_type2(parent1, H5R_DATASET_REGION, ref_buf1, &obj1_type) < 0) TEST_ERROR + if(H5Rget_obj_type2(parent2, H5R_DATASET_REGION, ref_buf2, &obj2_type) < 0) TEST_ERROR if(obj1_type != obj2_type) TEST_ERROR /* Open referenced objects */ @@ -960,15 +960,15 @@ compare_data(hid_t parent1, hid_t parent2, hid_t pid, hid_t tid, size_t nelmts, /* Check for types of objects handled */ switch(obj1_type) { - case H5G_DATASET: + case H5O_TYPE_DATASET: if(compare_datasets(obj1_id, obj2_id, pid, NULL) != TRUE) TEST_ERROR break; - case H5G_GROUP: + case H5O_TYPE_GROUP: if(compare_groups(obj1_id, obj2_id, pid, -1, 0) != TRUE) TEST_ERROR break; - case H5G_TYPE: + case H5O_TYPE_NAMED_DATATYPE: if(H5Tequal(obj1_id, obj2_id) != TRUE) TEST_ERROR break; |