diff options
-rw-r--r-- | src/H5FDonion.c | 40 | ||||
-rw-r--r-- | src/H5FDonion.h | 4 | ||||
-rw-r--r-- | src/H5FDonion_priv.h | 4 | ||||
-rw-r--r-- | test/onion.c | 142 | ||||
-rw-r--r-- | tools/src/h5diff/h5diff_common.c | 8 | ||||
-rw-r--r-- | tools/src/h5dump/h5dump.c | 6 |
6 files changed, 102 insertions, 102 deletions
diff --git a/src/H5FDonion.c b/src/H5FDonion.c index 8104030..b095161 100644 --- a/src/H5FDonion.c +++ b/src/H5FDonion.c @@ -990,12 +990,12 @@ H5FD_onion_revision_record_decode(unsigned char *buf, H5FD_onion_revision_record HDmemcpy(&ui64, ptr, 8); ui8p = (uint8_t *)&ui64; - UINT64DECODE(ui8p, record->revision_id); + UINT64DECODE(ui8p, record->revision_num); ptr += 8; HDmemcpy(&ui64, ptr, 8); ui8p = (uint8_t *)&ui64; - UINT64DECODE(ui8p, record->parent_revision_id); + UINT64DECODE(ui8p, record->parent_revision_num); ptr += 8; HDmemcpy(record->time_of_creation, ptr, 16); @@ -1168,8 +1168,8 @@ H5FD_onion_revision_record_encode(H5FD_onion_revision_record_t *record, unsigned HDmemcpy(ptr, H5FD__ONION_REVISION_RECORD_SIGNATURE, 4); ptr += 4; UINT32ENCODE(ptr, vers_u32); - UINT64ENCODE(ptr, record->revision_id); - UINT64ENCODE(ptr, record->parent_revision_id); + UINT64ENCODE(ptr, record->revision_num); + UINT64ENCODE(ptr, record->parent_revision_num); HDmemcpy(ptr, record->time_of_creation, 16); ptr += 16; UINT64ENCODE(ptr, record->logi_eof); @@ -1598,7 +1598,7 @@ done: */ static herr_t H5FD__onion_ingest_revision_record(H5FD_onion_revision_record_t *r_out, H5FD_t *raw_file, - const H5FD_onion_whole_history_t *whs, uint64_t revision_id) + const H5FD_onion_whole_history_t *whs, uint64_t revision_num) { unsigned char *buf = NULL; herr_t ret_value = SUCCEED; @@ -1663,7 +1663,7 @@ H5FD__onion_ingest_revision_record(H5FD_onion_revision_record_t *r_out, H5FD_t * if (r_out->checksum != sum) HGOTO_ERROR(H5E_VFL, H5E_BADVALUE, FAIL, "checksum mismatch between buffer and stored") - if (revision_id == r_out->revision_id) + if (revision_num == r_out->revision_num) break; H5MM_xfree(buf); @@ -1673,7 +1673,7 @@ H5FD__onion_ingest_revision_record(H5FD_onion_revision_record_t *r_out, H5FD_t * r_out->comment_size = 0; r_out->username_size = 0; - if (r_out->revision_id < revision_id) + if (r_out->revision_num < revision_num) low = (n == high) ? high : n + 1; else high = (n == low) ? low : n - 1; @@ -1698,9 +1698,9 @@ H5FD__onion_ingest_revision_record(H5FD_onion_revision_record_t *r_out, H5FD_t * if (r_out->checksum != sum) HGOTO_ERROR(H5E_VFL, H5E_BADVALUE, FAIL, "checksum mismatch between buffer and stored") - if (revision_id != r_out->revision_id) { + if (revision_num != r_out->revision_num) { #if 0 - HDprintf("revision_id: %d, r_out->revision_id: %d\n", revision_id, r_out->revision_id); + HDprintf("revision_num: %d, r_out->revision_num: %d\n", revision_num, r_out->revision_num); #endif HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, FAIL, "could not find target revision!") /* TODO: corrupted? */ @@ -2060,20 +2060,20 @@ H5FD__onion_open(const char *filename, unsigned flags, hid_t fapl_id, haddr_t ma HDprintf("File has %d revisions\n", file->summary.n_revisions); #endif /* Sanity check on revision ID */ - if (fa->revision_id > file->summary.n_revisions && - fa->revision_id != H5FD_ONION_FAPL_INFO_REVISION_ID_LATEST) + if (fa->revision_num > file->summary.n_revisions && + fa->revision_num != H5FD_ONION_FAPL_INFO_REVISION_ID_LATEST) HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, NULL, "target revision ID out of range") - if (fa->revision_id == 0) { + if (fa->revision_num == 0) { file->rev_record.logi_eof = canon_eof; } else if (file->summary.n_revisions > 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) { + MIN(fa->revision_num - 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)); + HDprintf("fa->revision_num: %d, file->summary.n_revisions: %d, min: %d\n", fa->revision_num, + file->summary.n_revisions, MIN(fa->revision_num, file->summary.n_revisions)); #endif HGOTO_ERROR(H5E_VFL, H5E_CANTDECODE, NULL, "can't get revision record from backing store") } @@ -2100,7 +2100,7 @@ HDprintf("File has %d revisions\n", file->summary.n_revisions); } file->origin_eof = file->header.origin_eof; #if 0 -HDprintf("fa->revision_id: %d\n", fa->revision_id); +HDprintf("fa->revision_num: %d\n", fa->revision_num); HDprintf("file->origin_eof: %llu\n", file->origin_eof); HDprintf("file->rev_record.logi_eof: %llu, file->logi_eof: %llu, canon_eof: %llu\n", file->rev_record.logi_eof, file->logi_eof, canon_eof); #endif @@ -2208,9 +2208,9 @@ H5FD__onion_open_rw(H5FD_onion_t *file, unsigned int flags, haddr_t maxaddr, boo if (NULL == (file->rev_index = H5FD_onion_revision_index_init(file->fa.page_size))) HGOTO_ERROR(H5E_VFL, H5E_CANTINIT, FAIL, "can't initialize revision index") - file->rev_record.parent_revision_id = file->rev_record.revision_id; + file->rev_record.parent_revision_num = file->rev_record.revision_num; if (!new_open) - file->rev_record.revision_id += 1; + file->rev_record.revision_num += 1; file->is_open_rw = TRUE; done: @@ -2309,7 +2309,7 @@ H5FD__onion_read(H5FD_t *_file, H5FD_mem_t type, hid_t H5_ATTR_UNUSED dxpl_id, h page_readsize = (size_t)page_size - page_gap_head - page_gap_tail; - if (TRUE == file->is_open_rw && file->fa.revision_id != 0 && + if (TRUE == file->is_open_rw && file->fa.revision_num != 0 && H5FD_onion_revision_index_find(file->rev_index, page_i, &entry_out_p)) { #if 0 HDputs("READING from revision index"); @@ -2320,7 +2320,7 @@ 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 && + else if (file->fa.revision_num != 0 && H5FD_onion_archival_index_find(&file->rev_record.archival_index, page_i, &entry_out_p)) { #if 0 HDputs("READING from archival index"); diff --git a/src/H5FDonion.h b/src/H5FDonion.h index 224d35e..308d3e9 100644 --- a/src/H5FDonion.h +++ b/src/H5FDonion.h @@ -65,7 +65,7 @@ typedef enum H5FD_onion_target_file_constant_t { * file". Shares filename and path as hdf5 file (if any), * with only a different filename extension. * - * revision_id: Which revision to open. Must be 0 (the original file) or the + * revision_num: Which revision to open. Must be 0 (the original file) or the * revision number of an existing revision. * Revision ID -1 is reserved to open the most recently-created * revision in history. @@ -118,7 +118,7 @@ typedef struct H5FD_onion_fapl_info_t { hid_t backing_fapl_id; uint32_t page_size; H5FD_onion_target_file_constant_t store_target; - uint64_t revision_id; + uint64_t revision_num; uint8_t force_write_open; uint8_t creation_flags; char comment[H5FD_ONION_FAPL_INFO_COMMENT_MAX_LEN + 1]; diff --git a/src/H5FDonion_priv.h b/src/H5FDonion_priv.h index d064281..af31a69 100644 --- a/src/H5FDonion_priv.h +++ b/src/H5FDonion_priv.h @@ -139,8 +139,8 @@ typedef struct H5FD_onion_history_header_t { */ typedef struct H5FD_onion_revision_record_t { uint8_t version; - uint64_t revision_id; - uint64_t parent_revision_id; + uint64_t revision_num; + uint64_t parent_revision_num; char time_of_creation[16]; uint64_t logi_eof; uint32_t user_id; diff --git a/test/onion.c b/test/onion.c index 9c17543..7349379 100644 --- a/test/onion.c +++ b/test/onion.c @@ -52,8 +52,8 @@ struct onion_filepaths { }; struct expected_revision { - uint64_t revision_id; - uint64_t parent_revision_id; + uint64_t revision_num; + uint64_t parent_revision_num; uint64_t logi_eof; uint64_t n_index_entries; const char *comment; @@ -72,7 +72,7 @@ struct write_info { }; struct revise_revision { hbool_t truncate; /* onion-create, truncating any existing data */ - uint64_t revision_id; + uint64_t revision_num; size_t n_writes; struct write_info writes[ONION_TEST_REV_REV_WRITES_MAX]; const char * comment; @@ -860,7 +860,7 @@ test_fapl(void) TEST_ERROR; if (H5FD_ONION_STORE_TARGET_ONION != info_out.store_target) TEST_ERROR; - if (H5FD_ONION_FAPL_INFO_REVISION_ID_LATEST != info_out.revision_id) + if (H5FD_ONION_FAPL_INFO_REVISION_ID_LATEST != info_out.revision_num) TEST_ERROR; if (0 != info_out.creation_flags) TEST_ERROR; @@ -1508,11 +1508,11 @@ test_revision_record_encode_decode(void) TEST_ERROR; if (record.user_id != r_out.user_id) TEST_ERROR; - if (record.revision_id != r_out.revision_id) + if (record.revision_num != r_out.revision_num) TEST_ERROR; - if (record.parent_revision_id != r_out.parent_revision_id) + if (record.parent_revision_num != r_out.parent_revision_num) TEST_ERROR; - if (record.parent_revision_id != r_out.parent_revision_id) + if (record.parent_revision_num != r_out.parent_revision_num) TEST_ERROR; if (record.checksum != r_out.checksum) TEST_ERROR; @@ -1786,9 +1786,9 @@ verify_history_as_expected_onion(H5FD_t *raw_file, struct expected_history *filt TEST_ERROR; if (rev_out.checksum != H5_checksum_fletcher32(buf, readsize - 4)) TEST_ERROR; - if (erp->revision_id != rev_out.revision_id) + if (erp->revision_num != rev_out.revision_num) TEST_ERROR; - if (erp->parent_revision_id != rev_out.parent_revision_id) + if (erp->parent_revision_num != rev_out.parent_revision_num) TEST_ERROR; if (erp->logi_eof != rev_out.logi_eof) TEST_ERROR; @@ -2213,14 +2213,14 @@ test_create_oniontarget(hbool_t truncate_canonical, hbool_t with_initial_data) if (NULL == vfile_raw) TEST_ERROR; - filter.page_size = onion_info.page_size; - filter.n_revisions = 1; - filter.origin_eof = 0; - filter.revisions[0].comment = onion_info.comment; - filter.revisions[0].n_index_entries = (uint64_t)(-1); /* don't care */ - filter.revisions[0].revision_id = 0; - filter.revisions[0].parent_revision_id = 0; - filter.revisions[0].logi_eof = (TRUE == with_initial_data) ? a_list_size_s : 0; + filter.page_size = onion_info.page_size; + filter.n_revisions = 1; + filter.origin_eof = 0; + filter.revisions[0].comment = onion_info.comment; + filter.revisions[0].n_index_entries = (uint64_t)(-1); /* don't care */ + filter.revisions[0].revision_num = 0; + filter.revisions[0].parent_revision_num = 0; + filter.revisions[0].logi_eof = (TRUE == with_initial_data) ? a_list_size_s : 0; if (verify_history_as_expected_onion(vfile_raw, &filter) < 0) TEST_ERROR; @@ -2380,13 +2380,13 @@ test_several_revisions_with_logical_gaps(void) HDremove(paths->recovery); /* Empty first revision */ - about[0].truncate = TRUE; - about[0].revision_id = H5FD_ONION_FAPL_INFO_REVISION_ID_LATEST; - about[0].comment = "first"; - about[0].n_writes = 0; + about[0].truncate = TRUE; + about[0].revision_num = H5FD_ONION_FAPL_INFO_REVISION_ID_LATEST; + about[0].comment = "first"; + about[0].n_writes = 0; about[1].truncate = FALSE; - about[1].revision_id = H5FD_ONION_FAPL_INFO_REVISION_ID_LATEST; + about[1].revision_num = H5FD_ONION_FAPL_INFO_REVISION_ID_LATEST; about[1].comment = "second"; about[1].n_writes = 1; about[1].writes[0].offset = a_off; @@ -2394,7 +2394,7 @@ test_several_revisions_with_logical_gaps(void) about[1].writes[0].buf = a_list_s; about[2].truncate = FALSE; - about[2].revision_id = H5FD_ONION_FAPL_INFO_REVISION_ID_LATEST; + about[2].revision_num = H5FD_ONION_FAPL_INFO_REVISION_ID_LATEST; about[2].comment = "third"; about[2].n_writes = 1; /* TODO: several writes */ about[2].writes[0].offset = b_off; @@ -2402,7 +2402,7 @@ test_several_revisions_with_logical_gaps(void) about[2].writes[0].buf = b_list_s; about[3].truncate = FALSE; - about[3].revision_id = H5FD_ONION_FAPL_INFO_REVISION_ID_LATEST; + about[3].revision_num = H5FD_ONION_FAPL_INFO_REVISION_ID_LATEST; about[3].comment = "fourth"; about[3].n_writes = 1; about[3].writes[0].offset = 0; @@ -2415,8 +2415,8 @@ test_several_revisions_with_logical_gaps(void) /* Inspect logical file */ /* THIS IS THE INITIAL FILE, SHOULD ONLY HAVE 8 BYTES */ - onion_info.revision_id = 0; - fapl_id = H5Pcreate(H5P_FILE_ACCESS); + onion_info.revision_num = 0; + fapl_id = H5Pcreate(H5P_FILE_ACCESS); if (H5I_INVALID_HID == fapl_id) TEST_ERROR; if (H5Pset_fapl_onion(fapl_id, &onion_info) < 0) @@ -2436,8 +2436,8 @@ test_several_revisions_with_logical_gaps(void) fapl_id = H5I_INVALID_HID; /* Empty first revision */ - onion_info.revision_id = 1; - fapl_id = H5Pcreate(H5P_FILE_ACCESS); + onion_info.revision_num = 1; + fapl_id = H5Pcreate(H5P_FILE_ACCESS); if (H5I_INVALID_HID == fapl_id) TEST_ERROR; if (H5Pset_fapl_onion(fapl_id, &onion_info) < 0) @@ -2457,8 +2457,8 @@ test_several_revisions_with_logical_gaps(void) fapl_id = H5I_INVALID_HID; /* One offset block in second revision */ - onion_info.revision_id = 2; - // onion_info.revision_id = 1; + onion_info.revision_num = 2; + // onion_info.revision_num = 1; fapl_id = H5Pcreate(H5P_FILE_ACCESS); if (H5I_INVALID_HID == fapl_id) TEST_ERROR; @@ -2511,8 +2511,8 @@ test_several_revisions_with_logical_gaps(void) fapl_id = H5I_INVALID_HID; /* Two offset blocks in third revision */ - onion_info.revision_id = 3; - // onion_info.revision_id = 2; + onion_info.revision_num = 3; + // onion_info.revision_num = 2; fapl_id = H5Pcreate(H5P_FILE_ACCESS); if (H5I_INVALID_HID == fapl_id) TEST_ERROR; @@ -2553,8 +2553,8 @@ test_several_revisions_with_logical_gaps(void) fapl_id = H5I_INVALID_HID; /* From start and partial overwrite in fourth revision */ - onion_info.revision_id = 4; - // onion_info.revision_id = 3; + onion_info.revision_num = 4; + // onion_info.revision_num = 3; fapl_id = H5Pcreate(H5P_FILE_ACCESS); if (H5I_INVALID_HID == fapl_id) TEST_ERROR; @@ -2594,8 +2594,8 @@ test_several_revisions_with_logical_gaps(void) /* No fifth revision */ // TODO: Can this be done without triggering an error? - /* onion_info.revision_id = 5; - //onion_info.revision_id = 4; + /* onion_info.revision_num = 5; + //onion_info.revision_num = 4; fapl_id = H5Pcreate(H5P_FILE_ACCESS); if (H5I_INVALID_HID == fapl_id) TEST_ERROR; @@ -2622,30 +2622,30 @@ test_several_revisions_with_logical_gaps(void) filter.n_revisions = 4; filter.origin_eof = 0; - filter.revisions[0].comment = "first"; - filter.revisions[0].n_index_entries = 0; - filter.revisions[0].revision_id = 0; - filter.revisions[0].parent_revision_id = 0; - filter.revisions[0].logi_eof = 0; + filter.revisions[0].comment = "first"; + filter.revisions[0].n_index_entries = 0; + filter.revisions[0].revision_num = 0; + filter.revisions[0].parent_revision_num = 0; + filter.revisions[0].logi_eof = 0; - filter.revisions[1].comment = "second"; - filter.revisions[1].n_index_entries = (a_list_size_s + ONION_TEST_PAGE_SIZE_5 - 1) >> 5; - filter.revisions[1].revision_id = 1; - filter.revisions[1].parent_revision_id = 0; - filter.revisions[1].logi_eof = a_off + a_list_size_s; + filter.revisions[1].comment = "second"; + filter.revisions[1].n_index_entries = (a_list_size_s + ONION_TEST_PAGE_SIZE_5 - 1) >> 5; + filter.revisions[1].revision_num = 1; + filter.revisions[1].parent_revision_num = 0; + filter.revisions[1].logi_eof = a_off + a_list_size_s; filter.revisions[2].comment = "third"; filter.revisions[2].n_index_entries = filter.revisions[1].n_index_entries + ((b_list_size_s + ONION_TEST_PAGE_SIZE_5 - 1) >> 5); - filter.revisions[2].revision_id = 2; - filter.revisions[2].parent_revision_id = 1; - filter.revisions[2].logi_eof = b_off + b_list_size_s; + filter.revisions[2].revision_num = 2; + filter.revisions[2].parent_revision_num = 1; + filter.revisions[2].logi_eof = b_off + b_list_size_s; - filter.revisions[3].comment = "fourth"; - filter.revisions[3].n_index_entries = filter.revisions[2].n_index_entries + 1; - filter.revisions[3].revision_id = 3; - filter.revisions[3].parent_revision_id = 2; - filter.revisions[3].logi_eof = b_off + b_list_size_s; + filter.revisions[3].comment = "fourth"; + filter.revisions[3].n_index_entries = filter.revisions[2].n_index_entries + 1; + filter.revisions[3].revision_num = 3; + filter.revisions[3].parent_revision_num = 2; + filter.revisions[3].logi_eof = b_off + b_list_size_s; if (verify_history_as_expected_onion(file, &filter) < 0) TEST_ERROR; @@ -2719,7 +2719,7 @@ do_onion_open_and_writes(const char *filename, H5FD_onion_fapl_info_t *onion_inf if (TRUE == about[i].truncate) flags |= H5F_ACC_CREAT | H5F_ACC_TRUNC; - onion_info_p->revision_id = about[i].revision_id; + onion_info_p->revision_num = about[i].revision_num; if (about[i].comment != NULL) { j = MIN(HDstrlen(about[i].comment), H5FD_ONION_FAPL_INFO_COMMENT_MAX_LEN); HDmemcpy(onion_info_p->comment, about[i].comment, j); @@ -2852,7 +2852,7 @@ test_page_aligned_history_create(void) HDremove(paths->recovery); about[0].truncate = TRUE; - about[0].revision_id = H5FD_ONION_FAPL_INFO_REVISION_ID_LATEST; + about[0].revision_num = H5FD_ONION_FAPL_INFO_REVISION_ID_LATEST; about[0].comment = "initial_commit"; about[0].n_writes = 1; about[0].writes[0].offset = 0; @@ -2860,7 +2860,7 @@ test_page_aligned_history_create(void) about[0].writes[0].buf = b_list_s; about[1].truncate = FALSE; - about[1].revision_id = H5FD_ONION_FAPL_INFO_REVISION_ID_LATEST; + about[1].revision_num = H5FD_ONION_FAPL_INFO_REVISION_ID_LATEST; about[1].comment = "second"; about[1].n_writes = 1; about[1].writes[0].offset = a_off; @@ -3191,8 +3191,8 @@ test_integration_create(void) * Verify the original file *---------------------------------------------------------------------- */ - onion_info.revision_id = 0; - fapl_id = H5Pcreate(H5P_FILE_ACCESS); + onion_info.revision_num = 0; + fapl_id = H5Pcreate(H5P_FILE_ACCESS); if (H5I_INVALID_HID == fapl_id) TEST_ERROR; if (H5Pset_fapl_onion(fapl_id, &onion_info) < 0) @@ -3238,8 +3238,8 @@ test_integration_create(void) * Verify the first revision *---------------------------------------------------------------------- */ - onion_info.revision_id = 1; - fapl_id = H5Pcreate(H5P_FILE_ACCESS); + onion_info.revision_num = 1; + fapl_id = H5Pcreate(H5P_FILE_ACCESS); if (H5I_INVALID_HID == fapl_id) TEST_ERROR; if (H5Pset_fapl_onion(fapl_id, &onion_info) < 0) @@ -3284,7 +3284,7 @@ test_integration_create(void) * Verify the second revision *---------------------------------------------------------------------- */ - onion_info.revision_id = 2; + onion_info.revision_num = 2; fapl_id = H5Pcreate(H5P_FILE_ACCESS); if (H5I_INVALID_HID == fapl_id) @@ -3567,7 +3567,7 @@ test_integration_create_simple(void) * Verify the second revision *---------------------------------------------------------------------- */ - onion_info.revision_id = 2; + onion_info.revision_num = 2; fapl_id = H5Pcreate(H5P_FILE_ACCESS); if (H5I_INVALID_HID == fapl_id) @@ -3873,7 +3873,7 @@ test_integration_create_delete_objects(void) * Verify the first revision: it should have the second dataset (DS2) *---------------------------------------------------------------------- */ - onion_info.revision_id = 1; + onion_info.revision_num = 1; if (H5Pset_fapl_onion(fapl_id, &onion_info) < 0) TEST_ERROR; @@ -3895,7 +3895,7 @@ test_integration_create_delete_objects(void) * Verify the second revision: the second dataset (DS2) should be removed *------------------------------------------------------------------------ */ - onion_info.revision_id = 2; + onion_info.revision_num = 2; if (H5Pset_fapl_onion(fapl_id, &onion_info) < 0) TEST_ERROR; @@ -3917,7 +3917,7 @@ test_integration_create_delete_objects(void) * Verify the third revision: the file attribute (file_attribute) should exist *------------------------------------------------------------------------- */ - onion_info.revision_id = 3; + onion_info.revision_num = 3; if (H5Pset_fapl_onion(fapl_id, &onion_info) < 0) TEST_ERROR; @@ -3939,7 +3939,7 @@ test_integration_create_delete_objects(void) * Verify the fourth revision: the file attribute (file_attribute) should be removed *------------------------------------------------------------------------- */ - onion_info.revision_id = 4; + onion_info.revision_num = 4; if (H5Pset_fapl_onion(fapl_id, &onion_info) < 0) TEST_ERROR; @@ -3961,7 +3961,7 @@ test_integration_create_delete_objects(void) * Verify the fifth revision: the group (new_group) should exist *------------------------------------------------------------------------- */ - onion_info.revision_id = 5; + onion_info.revision_num = 5; if (H5Pset_fapl_onion(fapl_id, &onion_info) < 0) TEST_ERROR; @@ -3983,7 +3983,7 @@ test_integration_create_delete_objects(void) * Verify the sixth revision: the group (new_group) should be removed *------------------------------------------------------------------------- */ - onion_info.revision_id = 6; + onion_info.revision_num = 6; if (H5Pset_fapl_onion(fapl_id, &onion_info) < 0) TEST_ERROR; @@ -4212,7 +4212,7 @@ test_integration_dset_extension(void) * Verify the first revision: it should have the extended data *---------------------------------------------------------------------- */ - onion_info.revision_id = 1; + onion_info.revision_num = 1; if (H5Pset_fapl_onion(fapl_id, &onion_info) < 0) TEST_ERROR; @@ -4253,7 +4253,7 @@ test_integration_dset_extension(void) * Verify the second revision: it should have the original data *---------------------------------------------------------------------- */ - onion_info.revision_id = 2; + onion_info.revision_num = 2; if (H5Pset_fapl_onion(fapl_id, &onion_info) < 0) TEST_ERROR; diff --git a/tools/src/h5diff/h5diff_common.c b/tools/src/h5diff/h5diff_common.c index 6bfdac7..a38f6d1 100644 --- a/tools/src/h5diff/h5diff_common.c +++ b/tools/src/h5diff/h5diff_common.c @@ -498,9 +498,9 @@ parse_command_line(int argc, const char *const *argv, const char **fname1, const if (opts->vfd_info[0].u.name) { if (!HDstrcmp(opts->vfd_info[0].u.name, "onion")) { if (opts->vfd_info[0].info) - onion_fa_g_1.revision_id = HDatoi((char *)(opts->vfd_info[0].info)); + onion_fa_g_1.revision_num = HDatoi((char *)(opts->vfd_info[0].info)); else - onion_fa_g_1.revision_id = 0; + onion_fa_g_1.revision_num = 0; /* Need to free this memory */ opts->vfd_info[0].info = HDmalloc(sizeof(H5FD_onion_fapl_info_t)); @@ -511,9 +511,9 @@ parse_command_line(int argc, const char *const *argv, const char **fname1, const if (opts->vfd_info[1].u.name) { if (!HDstrcmp(opts->vfd_info[1].u.name, "onion")) { if (opts->vfd_info[1].info) - onion_fa_g_2.revision_id = HDatoi((char *)(opts->vfd_info[1].info)); + onion_fa_g_2.revision_num = HDatoi((char *)(opts->vfd_info[1].info)); else - onion_fa_g_2.revision_id = 0; + onion_fa_g_2.revision_num = 0; /* Need to free this memory */ opts->vfd_info[1].info = HDmalloc(sizeof(H5FD_onion_fapl_info_t)); diff --git a/tools/src/h5dump/h5dump.c b/tools/src/h5dump/h5dump.c index bb0863a..29e2158 100644 --- a/tools/src/h5dump/h5dump.c +++ b/tools/src/h5dump/h5dump.c @@ -1316,11 +1316,11 @@ end_collect: if (vfd_info_g.u.name) { if (!HDstrcmp(vfd_info_g.u.name, "onion")) { if (vfd_info_g.info) - onion_fa_g.revision_id = HDatoi((char *)(vfd_info_g.info)); + onion_fa_g.revision_num = HDatoi((char *)(vfd_info_g.info)); else - onion_fa_g.revision_id = 0; + onion_fa_g.revision_num = 0; - HDprintf("Using revision %" PRIu64 "\n", onion_fa_g.revision_id); + HDprintf("Using revision %" PRIu64 "\n", onion_fa_g.revision_num); /* Need to free this memory */ vfd_info_g.info = HDmalloc(sizeof(H5FD_onion_fapl_info_t)); |