diff options
Diffstat (limited to 'test')
-rw-r--r-- | test/dtypes.c | 2 | ||||
-rw-r--r-- | test/gheap.c | 2 | ||||
-rw-r--r-- | test/istore.c | 4 | ||||
-rw-r--r-- | test/lheap.c | 4 | ||||
-rw-r--r-- | test/ohdr.c | 68 |
5 files changed, 40 insertions, 40 deletions
diff --git a/test/dtypes.c b/test/dtypes.c index e9ff79c..730dc0d 100644 --- a/test/dtypes.c +++ b/test/dtypes.c @@ -1585,7 +1585,7 @@ test_conv_bitfield(void) static herr_t convert_opaque(hid_t UNUSED st, hid_t UNUSED dt, H5T_cdata_t *cdata, size_t UNUSED nelmts, size_t UNUSED stride, void UNUSED *_buf, - void UNUSED *bkg, hid_t dset_xfer_plid) + void UNUSED *bkg, hid_t UNUSED dset_xfer_plid) { if (H5T_CONV_CONV==cdata->command) num_opaque_conversions_g++; return 0; diff --git a/test/gheap.c b/test/gheap.c index 404b24a..1cae524 100644 --- a/test/gheap.c +++ b/test/gheap.c @@ -84,7 +84,7 @@ test_1 (hid_t fapl) FAILED(); puts(" Unable to insert object into global heap"); nerrors++; - } else if (i && H5F_addr_gt (&(obj[i-1].addr), &(obj[i].addr))) { + } else if (i && H5F_addr_gt (obj[i-1].addr, obj[i].addr)) { FAILED(); puts(" Collection addresses are not monotonically increasing"); nerrors++; diff --git a/test/istore.c b/test/istore.c index adf23b6..0ccfe5e 100644 --- a/test/istore.c +++ b/test/istore.c @@ -562,8 +562,8 @@ main(int argc, char *argv[]) */ if (H5F_LOW_FAMILY==H5Pget_driver(fapl)) { haddr_t addr; - addr.offset = 8 * ((uint64_t)1<<30); /*8 GB */ - H5F_low_seteof(f->shared->lf, &addr); + addr = 8 * ((uint64_t)1<<30); /*8 GB */ + H5F_low_seteof(f->shared->lf, addr); } /* diff --git a/test/lheap.c b/test/lheap.c index d281bf2..85f5338 100644 --- a/test/lheap.c +++ b/test/lheap.c @@ -76,7 +76,7 @@ main(void) for (j=4; j<i; j++) buf[j] = '0' + j%10; if (j>4) buf[j] = '\0'; - if ((size_t)(-1)==(obj[i]=H5HL_insert(f, &heap_addr, strlen(buf)+1, + if ((size_t)(-1)==(obj[i]=H5HL_insert(f, heap_addr, strlen(buf)+1, buf))) { FAILED(); H5Eprint(stdout); @@ -101,7 +101,7 @@ main(void) sprintf(buf, "%03d-", i); for (j=4; j<i; j++) buf[j] = '0' + j%10; if (j>4) buf[j] = '\0'; - if (NULL==(s=H5HL_peek(f, &heap_addr, obj[i]))) { + if (NULL==(s=H5HL_peek(f, heap_addr, obj[i]))) { FAILED(); H5Eprint(stdout); goto error; 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; |