summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>1998-10-22 22:49:16 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>1998-10-22 22:49:16 (GMT)
commit671ed571239ccad6c86918dfe04580c73d1b130e (patch)
treef22698c958e5a4d497e1c7dfb69d1518915c9d2f /test
parentf571a762fd5894f551c1f906641af229d839c6a9 (diff)
downloadhdf5-671ed571239ccad6c86918dfe04580c73d1b130e.zip
hdf5-671ed571239ccad6c86918dfe04580c73d1b130e.tar.gz
hdf5-671ed571239ccad6c86918dfe04580c73d1b130e.tar.bz2
[svn-r776] Fixed references, object references should be working now.
Diffstat (limited to 'test')
-rw-r--r--test/testhdf5.c2
-rw-r--r--test/trefer.c12
2 files changed, 5 insertions, 9 deletions
diff --git a/test/testhdf5.c b/test/testhdf5.c
index 321b831..612a4ac 100644
--- a/test/testhdf5.c
+++ b/test/testhdf5.c
@@ -170,9 +170,7 @@ main(int argc, char *argv[])
InitTest("h5s", test_h5s, cleanup_h5s, "Dataspaces");
InitTest("attr", test_attr, cleanup_attr, "Attributes");
InitTest("select", test_select, cleanup_select, "Selections");
-#ifdef LATER
InitTest("reference", test_reference, cleanup_reference, "References");
-#endif /* LATER */
Verbosity = 4; /* Default Verbosity is Low */
H5get_libversion(&major, &minor, &release);
diff --git a/test/trefer.c b/test/trefer.c
index 382b0a8..0ffa001 100644
--- a/test/trefer.c
+++ b/test/trefer.c
@@ -50,7 +50,7 @@ test_reference_obj(void)
hid_t group; /* Group ID */
hid_t sid1; /* Dataspace ID */
hsize_t dims1[] = {SPACE1_DIM1};
- href_t *wbuf, /* buffer to write to disk */
+ hobj_ref_t *wbuf, /* buffer to write to disk */
*rbuf, /* buffer read from disk */
*tbuf; /* temp. buffer read from disk */
uint32 *tu32; /* Temporary pointer to uint32 data */
@@ -61,9 +61,9 @@ test_reference_obj(void)
MESSAGE(5, ("Testing Object Reference Functions\n"));
/* Allocate write & read buffers */
- wbuf=malloc(sizeof(href_t)*SPACE1_DIM1);
- rbuf=malloc(sizeof(href_t)*SPACE1_DIM1);
- tbuf=malloc(sizeof(href_t)*SPACE1_DIM1);
+ wbuf=malloc(sizeof(hobj_ref_t)*SPACE1_DIM1);
+ rbuf=malloc(sizeof(hobj_ref_t)*SPACE1_DIM1);
+ tbuf=malloc(sizeof(hobj_ref_t)*SPACE1_DIM1);
/* Create file */
fid1 = H5Fcreate(FILE, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
@@ -118,11 +118,9 @@ test_reference_obj(void)
ret = H5Rcreate(&wbuf[2],fid1,"/Group1",H5R_OBJECT,-1);
CHECK(ret, FAIL, "H5Rcreate");
-printf("before pointer write\n");
/* Write selection to disk */
ret=H5Dwrite(dataset,H5T_STD_PTR_OBJ,H5S_ALL,H5S_ALL,H5P_DEFAULT,wbuf);
CHECK(ret, FAIL, "H5Dwrite");
-printf("after pointer write\n");
/* Close disk dataspace */
ret = H5Sclose(sid1);
@@ -149,7 +147,7 @@ printf("after pointer write\n");
CHECK(ret, FAIL, "H5Dread");
/* Try to open objects */
- dset2 = H5Rdereference(dataset,&rbuf[0]);
+ dset2 = H5Rdereference(dataset,H5R_OBJECT,&rbuf[0]);
CHECK(dataset, FAIL, "H5Rdereference");
/* Check information in referenced dataset */