summaryrefslogtreecommitdiffstats
path: root/test/ohdr.c
diff options
context:
space:
mode:
authorRobb Matzke <matzke@llnl.gov>1999-07-28 18:25:43 (GMT)
committerRobb Matzke <matzke@llnl.gov>1999-07-28 18:25:43 (GMT)
commite4834c43ce6528308ebd5375bd4c7a0df88af427 (patch)
tree0039040d95cc92fdb197b2902436e32a020a7b6f /test/ohdr.c
parent139688863f191366fe27fbab9654a52285e63c11 (diff)
downloadhdf5-e4834c43ce6528308ebd5375bd4c7a0df88af427.zip
hdf5-e4834c43ce6528308ebd5375bd4c7a0df88af427.tar.gz
hdf5-e4834c43ce6528308ebd5375bd4c7a0df88af427.tar.bz2
[svn-r1548] Changes since 19990727
---------------------- ./src/H5.c [1.3] ./src/H5AC.c [1.3] ./src/H5ACprivate.h [1.3] ./src/H5B.c [1.3] ./src/H5Bprivate.h [1.3] ./src/H5D.c [1.3] ./src/H5F.c [1.3] ./src/H5Farray.c [1.3] ./src/H5Fcore.c [1.3] ./src/H5Ffamily.c [1.3] ./src/H5Fistore.c [1.3] ./src/H5Flow.c [1.3] ./src/H5Fmpio.c [1.3] ./src/H5Fprivate.h [1.3] ./src/H5Fsec2.c [1.3] ./src/H5Fsplit.c [1.3] ./src/H5Fstdio.c [1.3] ./src/H5G.c [1.3] ./src/H5Gent.c [1.3] ./src/H5Gnode.c [1.3] ./src/H5Gprivate.h [1.3] ./src/H5Gstab.c [1.3] ./src/H5HG.c [1.3] ./src/H5HGprivate.h [1.3] ./src/H5HL.c [1.3] ./src/H5HLprivate.h [1.3] ./src/H5MF.c [1.3] ./src/H5MFprivate.h [1.3] ./src/H5O.c [1.3] ./src/H5Oattr.c [1.3] ./src/H5Ocont.c [1.3] ./src/H5Odtype.c [1.3] ./src/H5Oefl.c [1.3] ./src/H5Olayout.c [1.3] ./src/H5Oprivate.h [1.3] ./src/H5Oshared.c [1.3] ./src/H5Ostab.c [1.3] ./src/H5P.c [1.3] ./src/H5R.c [1.3] ./src/H5Smpio.c [1.3] ./src/H5T.c [1.3] ./src/H5Tvlen.c [1.3] ./src/H5private.h [1.3] ./test/dtypes.c [1.3] ./test/gheap.c [1.3] ./test/istore.c [1.3] ./test/lheap.c [1.3] ./test/ohdr.c [1.3] ./tools/h5debug.c [1.3] File addresses (the `haddr_t' type) are passed by value instead of by reference. The type is no longer a struct. This is one of the preliminary changes needed for the Virtual File Layer stuff. ./src/H5Fprivate.h [1.3] ./src/H5Flow.c [1.3] Some address functions were rewritten as macros.
Diffstat (limited to 'test/ohdr.c')
-rw-r--r--test/ohdr.c68
1 files changed, 34 insertions, 34 deletions
diff --git a/test/ohdr.c b/test/ohdr.c
index 32b97bb..2da033b 100644
--- a/test/ohdr.c
+++ b/test/ohdr.c
@@ -71,14 +71,14 @@ main(void)
/* create a new message */
TESTING("message creation");
- stab.btree_addr.offset = 11111111;
- stab.heap_addr.offset = 22222222;
+ stab.btree_addr = 11111111;
+ stab.heap_addr = 22222222;
if (H5O_modify(&oh_ent, H5O_STAB, H5O_NEW_MESG, 0, &stab)<0) {
FAILED();
H5Eprint(stdout);
goto error;
}
- if (H5AC_flush(f, NULL, 0, TRUE)<0) {
+ if (H5AC_flush(f, NULL, H5F_ADDR_UNDEF, TRUE)<0) {
FAILED();
H5Eprint(stdout);
goto error;
@@ -88,13 +88,13 @@ main(void)
H5Eprint(stdout);
goto error;
}
- if (H5F_addr_ne(&(ro.btree_addr), &(stab.btree_addr)) ||
- H5F_addr_ne(&(ro.heap_addr), &(stab.heap_addr))) {
+ if (H5F_addr_ne(ro.btree_addr, stab.btree_addr) ||
+ H5F_addr_ne(ro.heap_addr, stab.heap_addr)) {
FAILED();
HDfprintf(stdout, " got: {%a, %a}\n",
- &(ro.btree_addr), &(ro.heap_addr));
+ ro.btree_addr, ro.heap_addr);
HDfprintf(stdout, " ans: {%a, %a}\n",
- &(stab.btree_addr), &(stab.heap_addr));
+ stab.btree_addr, stab.heap_addr);
goto error;
}
PASSED();
@@ -103,14 +103,14 @@ main(void)
* Test modification of an existing message.
*/
TESTING("message modification");
- stab.btree_addr.offset = 33333333;
- stab.heap_addr.offset = 44444444;
+ stab.btree_addr = 33333333;
+ stab.heap_addr = 44444444;
if (H5O_modify(&oh_ent, H5O_STAB, 0, 0, &stab)<0) {
FAILED();
H5Eprint(stdout);
goto error;
}
- if (H5AC_flush(f, NULL, 0, TRUE)<0) {
+ if (H5AC_flush(f, NULL, H5F_ADDR_UNDEF, TRUE)<0) {
FAILED();
H5Eprint(stdout);
goto error;
@@ -120,13 +120,13 @@ main(void)
H5Eprint(stdout);
goto error;
}
- if (H5F_addr_ne(&(ro.btree_addr), &(stab.btree_addr)) ||
- H5F_addr_ne(&(ro.heap_addr), &(stab.heap_addr))) {
+ if (H5F_addr_ne(ro.btree_addr, stab.btree_addr) ||
+ H5F_addr_ne(ro.heap_addr, stab.heap_addr)) {
FAILED();
HDfprintf(stdout, " got: {%a, %a}\n",
- &(ro.btree_addr), &(ro.heap_addr));
+ ro.btree_addr, ro.heap_addr);
HDfprintf(stdout, " ans: {%a, %a}\n",
- &(stab.btree_addr), &(stab.heap_addr));
+ stab.btree_addr, stab.heap_addr);
goto error;
}
PASSED();
@@ -136,14 +136,14 @@ main(void)
* Test creation of a second message of the same type.
*/
TESTING("duplicate message creation");
- stab.btree_addr.offset = 55555555;
- stab.heap_addr.offset = 66666666;
+ stab.btree_addr = 55555555;
+ stab.heap_addr = 66666666;
if (H5O_modify(&oh_ent, H5O_STAB, H5O_NEW_MESG, 0, &stab)<0) {
FAILED();
H5Eprint(stdout);
goto error;
}
- if (H5AC_flush(f, NULL, 0, TRUE)<0) {
+ if (H5AC_flush(f, NULL, H5F_ADDR_UNDEF, TRUE)<0) {
FAILED();
H5Eprint(stdout);
goto error;
@@ -153,13 +153,13 @@ main(void)
H5Eprint(stdout);
goto error;
}
- if (H5F_addr_ne(&(ro.btree_addr), &(stab.btree_addr)) ||
- H5F_addr_ne(&(ro.heap_addr), &(stab.heap_addr))) {
+ if (H5F_addr_ne(ro.btree_addr, stab.btree_addr) ||
+ H5F_addr_ne(ro.heap_addr, stab.heap_addr)) {
FAILED();
HDfprintf(stdout, " got: {%a, %a}\n",
- &(ro.btree_addr), &(ro.heap_addr));
+ ro.btree_addr, ro.heap_addr);
HDfprintf(stdout, " ans: {%a, %a}\n",
- &(stab.btree_addr), &(stab.heap_addr));
+ stab.btree_addr, stab.heap_addr);
goto error;
}
PASSED();
@@ -168,14 +168,14 @@ main(void)
* Test modification of the second message with a symbol table.
*/
TESTING("duplicate message modification");
- stab.btree_addr.offset = 77777777;
- stab.heap_addr.offset = 88888888;
+ stab.btree_addr = 77777777;
+ stab.heap_addr = 88888888;
if (H5O_modify(&oh_ent, H5O_STAB, 1, 0, &stab)<0) {
FAILED();
H5Eprint(stdout);
goto error;
}
- if (H5AC_flush(f, NULL, 0, TRUE)<0) {
+ if (H5AC_flush(f, NULL, H5F_ADDR_UNDEF, TRUE)<0) {
FAILED();
H5Eprint(stdout);
goto error;
@@ -185,13 +185,13 @@ main(void)
H5Eprint(stdout);
goto error;
}
- if (H5F_addr_ne(&(ro.btree_addr), &(stab.btree_addr)) ||
- H5F_addr_ne(&(ro.heap_addr), &(stab.heap_addr))) {
+ if (H5F_addr_ne(ro.btree_addr, stab.btree_addr) ||
+ H5F_addr_ne(ro.heap_addr, stab.heap_addr)) {
FAILED();
HDfprintf(stdout, " got: {%a, %a}\n",
- &(ro.btree_addr), &(ro.heap_addr));
+ ro.btree_addr, ro.heap_addr);
HDfprintf(stdout, " ans: {%a, %a}\n",
- &(stab.btree_addr), &(stab.heap_addr));
+ stab.btree_addr, stab.heap_addr);
goto error;
}
PASSED();
@@ -202,15 +202,15 @@ main(void)
*/
TESTING("object header overflow in memory");
for (i=0; i<40; i++) {
- stab.btree_addr.offset = (i+1)*1000+1;
- stab.heap_addr.offset = (i+1)*1000+2;
+ stab.btree_addr = (i+1)*1000+1;
+ stab.heap_addr = (i+1)*1000+2;
if (H5O_modify(&oh_ent, H5O_STAB, H5O_NEW_MESG, 0, &stab)<0) {
FAILED();
H5Eprint(stdout);
goto error;
}
}
- if (H5AC_flush(f, NULL, 0, TRUE)<0) {
+ if (H5AC_flush(f, NULL, H5F_ADDR_UNDEF, TRUE)<0) {
FAILED();
H5Eprint(stdout);
goto error;
@@ -223,14 +223,14 @@ main(void)
*/
TESTING("object header overflow on disk");
for (i=0; i<10; i++) {
- stab.btree_addr.offset = (i + 1) * 1000 + 10;
- stab.heap_addr.offset = (i + 1) * 1000 + 20;
+ stab.btree_addr = (i + 1) * 1000 + 10;
+ stab.heap_addr = (i + 1) * 1000 + 20;
if (H5O_modify(&oh_ent, H5O_STAB, H5O_NEW_MESG, 0, &stab)<0) {
FAILED();
H5Eprint(stdout);
goto error;
}
- if (H5AC_flush(f, NULL, 0, TRUE)<0) {
+ if (H5AC_flush(f, NULL, H5F_ADDR_UNDEF, TRUE)<0) {
FAILED();
H5Eprint(stdout);
goto error;