diff options
-rw-r--r-- | src/H5FDonion.c | 9 | ||||
-rw-r--r-- | test/onion.c | 44 | ||||
-rw-r--r-- | tools/src/h5dump/h5dump.c | 4 |
3 files changed, 29 insertions, 28 deletions
diff --git a/src/H5FDonion.c b/src/H5FDonion.c index d045ea1..96d4806 100644 --- a/src/H5FDonion.c +++ b/src/H5FDonion.c @@ -2097,9 +2097,9 @@ HDprintf("File has %d revisions\n", file->summary.n_revisions); HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, NULL, "target revision ID out of range") if (file->summary.n_revisions > 0 && fa->revision_id != 0 && - H5FD__onion_ingest_revision_record(&file->rev_record, file->backing_onion, &file->summary, - MIN(fa->revision_id - 1, (file->summary.n_revisions - 1))) < - 0) { + H5FD__onion_ingest_revision_record( + &file->rev_record, file->backing_onion, &file->summary, + MIN(fa->revision_id - 1, (file->summary.n_revisions - 1))) < 0) { #if 0 HDprintf("fa->revision_id: %d, file->summary.n_revisions: %d, min: %d\n", fa->revision_id, file->summary.n_revisions, MIN(fa->revision_id, file->summary.n_revisions)); @@ -2349,7 +2349,8 @@ H5FD__onion_read(H5FD_t *_file, H5FD_mem_t type, hid_t H5_ATTR_UNUSED dxpl_id, h (haddr_t)entry_out_p->phys_addr + page_gap_head, page_readsize, buf_out) < 0) HGOTO_ERROR(H5E_VFL, H5E_READERROR, FAIL, "can't get working file data") } /* end if page exists in 'live' revision index */ - else if (file->fa.revision_id != 0 && H5FD_onion_archival_index_find(&file->rev_record.archival_index, page_i, &entry_out_p)) { + else if (file->fa.revision_id != 0 && + H5FD_onion_archival_index_find(&file->rev_record.archival_index, page_i, &entry_out_p)) { #if 0 HDputs("READING from archival index"); HDprintf("page_size: %llu, page_gap_head: %llu, page_gap_tail: %llu, page_readsize: %llu\n", diff --git a/test/onion.c b/test/onion.c index cbb8cec..4256184 100644 --- a/test/onion.c +++ b/test/onion.c @@ -2426,9 +2426,9 @@ test_several_revisions_with_logical_gaps(void) if (NULL == file) TEST_ERROR; if (0 != H5FDget_eof(file, H5FD_MEM_DRAW)) { - HDprintf("\nEOF is not zero, it is: %llu\n", H5FDget_eof(file, H5FD_MEM_DRAW)); + HDprintf("\nEOF is not zero, it is: %llu\n", H5FDget_eof(file, H5FD_MEM_DRAW)); TEST_ERROR; - } + } if (H5FDclose(file) < 0) TEST_ERROR; file = NULL; @@ -3120,7 +3120,7 @@ test_integration_create(void) if (H5Fclose(file) < 0) TEST_ERROR - /* + /* * Create first revision */ HDputs("."); @@ -3176,7 +3176,7 @@ test_integration_create(void) TEST_ERROR file_id = H5I_INVALID_HID; - /* + /* * Create second revision */ HDputs("."); @@ -3239,7 +3239,7 @@ test_integration_create(void) // Read back data to check for validtiy onion_info.revision_id = 2; - //onion_info.revision_id = 1; + // onion_info.revision_id = 1; fapl_id = H5Pcreate(H5P_FILE_ACCESS); if (H5I_INVALID_HID == fapl_id) TEST_ERROR; @@ -3291,7 +3291,7 @@ test_integration_create(void) for (j = 0; j < 7; j++) { // printf("i: %d, j: %d\n", i, j); int expected = i * 3 + j + 5; - //int expected = i * 6 + j + 1; + // int expected = i * 6 + j + 1; if (rdata[i][j] != expected) { printf("ERROR!!! Expected: %d, Got: %d\n", expected, rdata[i][j]); HDfflush(stdout); @@ -3344,7 +3344,7 @@ error: static int test_integration_create_simple(void) { - const char *basename = "integration.h5"; + const char * basename = "integration.h5"; hid_t fapl_id = H5I_INVALID_HID; struct onion_filepaths *paths = NULL; H5FD_onion_fapl_info_t onion_info = { @@ -3500,7 +3500,7 @@ test_integration_create_simple(void) TEST_ERROR file_id = H5I_INVALID_HID; - /* + /* * Create second revision */ HDputs("."); @@ -3557,7 +3557,7 @@ test_integration_create_simple(void) TEST_ERROR file_id = H5I_INVALID_HID; - /* + /* * Create third revision */ @@ -3623,8 +3623,8 @@ test_integration_create_simple(void) // Read back data to check for validtiy // onion_info.revision_id = 3; onion_info.revision_id = 2; - //onion_info.revision_id = 1; - //onion_info.revision_id = 0; + // onion_info.revision_id = 1; + // onion_info.revision_id = 0; fapl_id = H5Pcreate(H5P_FILE_ACCESS); if (H5I_INVALID_HID == fapl_id) TEST_ERROR; @@ -3677,10 +3677,10 @@ test_integration_create_simple(void) // for (j = 0; j < 1024; j++) { for (j = 0; j < 1024; j += 20) { // printf("i: %d, j: %d\n", i, j); - //int expected = j; - //int expected = j + 1024; + // int expected = j; + // int expected = j + 1024; int expected = j + 2048; - //int expected = j + 3072; + // int expected = j + 3072; if (rdata[i][j] != expected) { printf("ERROR!!! Expected: %d, Got: %d\n", expected, rdata[i][j]); HDfflush(stdout); @@ -3703,10 +3703,10 @@ test_integration_create_simple(void) TEST_ERROR; fapl_id = H5I_INVALID_HID; - //HDremove(paths->canon); - //HDremove(paths->onion); - //HDremove(paths->recovery); - //onion_filepaths_destroy(paths); + // HDremove(paths->canon); + // HDremove(paths->onion); + // HDremove(paths->recovery); + // onion_filepaths_destroy(paths); PASSED(); return 0; @@ -3714,10 +3714,10 @@ test_integration_create_simple(void) error: if (paths != NULL) { - //HDremove(paths->canon); - //HDremove(paths->onion); - //HDremove(paths->recovery); - //onion_filepaths_destroy(paths); + // HDremove(paths->canon); + // HDremove(paths->onion); + // HDremove(paths->recovery); + // onion_filepaths_destroy(paths); } if (dset != H5I_INVALID_HID) diff --git a/tools/src/h5dump/h5dump.c b/tools/src/h5dump/h5dump.c index c278890..3abc3d2 100644 --- a/tools/src/h5dump/h5dump.c +++ b/tools/src/h5dump/h5dump.c @@ -1274,7 +1274,7 @@ end_collect: break; case 'F': onion_revision_g = atol(H5_optarg); - HDprintf("Using revision %d\n", onion_revision_g); + HDprintf("Using revision %d\n", onion_revision_g); break; case '?': default: @@ -1415,7 +1415,7 @@ main(int argc, const char *argv[]) #endif } else if (!HDstrcmp(driver_name_g, drivernames[ONION_VFD_IDX])) { - onion_fa_g.revision_id = onion_revision_g; + onion_fa_g.revision_id = onion_revision_g; vfd_info.info = (void *)&onion_fa_g; } |