Modifications for the following items in the punch list:

(A) #5: Add the "pb_expansion_threshold" field to the "H5F_vfd_swmr_config_t" structure
and update H5Pset_vfd_swmr_config() and H5Pget_vfd_swmr_config() accordingly
(B) #13 bullet 2: Comment H5F_vfd_swmr_config_t in H5Fpublic.h properly
(copied from John's description in the RFC)
(C) Change the field name "vfd_swmr_writer" to "writer" in "struct H5F_vfd_swmr_config_t"
(as indicated on page 11 in the RFC) and all references to it

22 files changed, 20 insertions, 20 deletions

diff --git a/test/page_buffer.c b/test/page_buffer.c
index 38f4529..4848c09 100644
--- a/test/page_buffer.c
+++ b/test/page_buffer.c
@@ -113,7 +113,7 @@ swmr_fapl_augment(hid_t fapl, const char *filename, uint32_t max_lag)
       .version = H5F__CURR_VFD_SWMR_CONFIG_VERSION
     , .tick_len = 4
     , .max_lag = 5
-    , .vfd_swmr_writer = true
+    , .writer = true
     , .md_pages_reserved = 128
     };
     const char *dname;
diff --git a/test/testfiles/plist_files/def_fapl_32be b/test/testfiles/plist_files/def_fapl_32be
index ed36a07..5e47eca 100644
--- a/test/testfiles/plist_files/def_fapl_32be
+++ b/test/testfiles/plist_files/def_fapl_32be
diff --git a/test/testfiles/plist_files/def_fapl_32le b/test/testfiles/plist_files/def_fapl_32le
index ed36a07..5e47eca 100644
--- a/test/testfiles/plist_files/def_fapl_32le
+++ b/test/testfiles/plist_files/def_fapl_32le
diff --git a/test/testfiles/plist_files/def_fapl_64be b/test/testfiles/plist_files/def_fapl_64be
index ed36a07..5e47eca 100644
--- a/test/testfiles/plist_files/def_fapl_64be
+++ b/test/testfiles/plist_files/def_fapl_64be
diff --git a/test/testfiles/plist_files/def_fapl_64le b/test/testfiles/plist_files/def_fapl_64le
index ed36a07..5e47eca 100644
--- a/test/testfiles/plist_files/def_fapl_64le
+++ b/test/testfiles/plist_files/def_fapl_64le
diff --git a/test/testfiles/plist_files/fapl_32be b/test/testfiles/plist_files/fapl_32be
index 27afb11..d4e413a 100644
--- a/test/testfiles/plist_files/fapl_32be
+++ b/test/testfiles/plist_files/fapl_32be
diff --git a/test/testfiles/plist_files/fapl_32le b/test/testfiles/plist_files/fapl_32le
index 27afb11..d4e413a 100644
--- a/test/testfiles/plist_files/fapl_32le
+++ b/test/testfiles/plist_files/fapl_32le
diff --git a/test/testfiles/plist_files/fapl_64be b/test/testfiles/plist_files/fapl_64be
index 27afb11..d4e413a 100644
--- a/test/testfiles/plist_files/fapl_64be
+++ b/test/testfiles/plist_files/fapl_64be
diff --git a/test/testfiles/plist_files/fapl_64le b/test/testfiles/plist_files/fapl_64le
index 27afb11..d4e413a 100644
--- a/test/testfiles/plist_files/fapl_64le
+++ b/test/testfiles/plist_files/fapl_64le
diff --git a/test/testfiles/plist_files/lapl_32be b/test/testfiles/plist_files/lapl_32be
index 1d61295..f1e2d8b 100644
--- a/test/testfiles/plist_files/lapl_32be
+++ b/test/testfiles/plist_files/lapl_32be
diff --git a/test/testfiles/plist_files/lapl_32le b/test/testfiles/plist_files/lapl_32le
index 1d61295..f1e2d8b 100644
--- a/test/testfiles/plist_files/lapl_32le
+++ b/test/testfiles/plist_files/lapl_32le
diff --git a/test/testfiles/plist_files/lapl_64be b/test/testfiles/plist_files/lapl_64be
index 1d61295..f1e2d8b 100644
--- a/test/testfiles/plist_files/lapl_64be
+++ b/test/testfiles/plist_files/lapl_64be
diff --git a/test/testfiles/plist_files/lapl_64le b/test/testfiles/plist_files/lapl_64le
index 1d61295..f1e2d8b 100644
--- a/test/testfiles/plist_files/lapl_64le
+++ b/test/testfiles/plist_files/lapl_64le
diff --git a/test/vfd_swmr.c b/test/vfd_swmr.c
index d664957..c5d3200 100644
--- a/test/vfd_swmr.c
+++ b/test/vfd_swmr.c
@@ -135,7 +135,7 @@ test_fapl(void)
 
     /* Set md_file_path */
     HDstrcpy(my_config->md_file_path, MD_FILENAME);
-    my_config->vfd_swmr_writer = TRUE;
+    my_config->writer = TRUE;
 
     /* Should succeed in setting the configuration info */
     if(H5Pset_vfd_swmr_config(fapl, my_config) < 0)
@@ -242,7 +242,7 @@ test_file_fapl(void)
     config1->version = H5F__CURR_VFD_SWMR_CONFIG_VERSION;
     config1->tick_len = 4; 
     config1->max_lag = 6;
-    config1->vfd_swmr_writer = TRUE;
+    config1->writer = TRUE;
     config1->md_pages_reserved = 2;
     HDstrcpy(config1->md_file_path, MD_FILENAME);
 
@@ -332,7 +332,7 @@ test_file_fapl(void)
     config2->version = H5F__CURR_VFD_SWMR_CONFIG_VERSION;
     config2->tick_len = 4; 
     config2->max_lag = 10;
-    config2->vfd_swmr_writer = TRUE;
+    config2->writer = TRUE;
     config2->md_pages_reserved = 2;
     HDstrcpy(config2->md_file_path, MD_FILENAME);
 
@@ -378,7 +378,7 @@ test_file_fapl(void)
     config2->version = H5F__CURR_VFD_SWMR_CONFIG_VERSION;
     config2->tick_len = 4; 
     config2->max_lag = 10;
-    config2->vfd_swmr_writer = FALSE;
+    config2->writer = FALSE;
     config2->md_pages_reserved = 2;
     HDstrcpy(config2->md_file_path, MD_FILENAME);
 
@@ -409,10 +409,10 @@ test_file_fapl(void)
         TEST_ERROR;
 
     /* Verify that the retrieved config is a writer */
-    if(file_config->vfd_swmr_writer == FALSE)
+    if(file_config->writer == FALSE)
         TEST_ERROR;
     /* Verify that the retrieved config is not the same as the initial configuration */
-    if(file_config->vfd_swmr_writer == config2->vfd_swmr_writer)
+    if(file_config->writer == config2->writer)
         TEST_ERROR;
 
     /* Closing */
@@ -524,7 +524,7 @@ test_file_end_tick(void)
     my_config->version = H5F__CURR_VFD_SWMR_CONFIG_VERSION;
     my_config->tick_len = 3; 
     my_config->max_lag = 3;
-    my_config->vfd_swmr_writer = TRUE;
+    my_config->writer = TRUE;
     my_config->md_pages_reserved = 2;
     HDstrcpy(my_config->md_file_path, MD_FILENAME);
 
@@ -655,7 +655,7 @@ test_writer_create_open_flush(void)
     my_config->version = H5F__CURR_VFD_SWMR_CONFIG_VERSION;
     my_config->tick_len = 1; 
     my_config->max_lag = 3;
-    my_config->vfd_swmr_writer = TRUE;
+    my_config->writer = TRUE;
     my_config->md_pages_reserved = 1;
     HDstrcpy(my_config->md_file_path, MD_FILENAME);
 
@@ -792,7 +792,7 @@ test_writer_md(void)
     my_config->version = H5F__CURR_VFD_SWMR_CONFIG_VERSION;
     my_config->tick_len = 1; 
     my_config->max_lag = 3;
-    my_config->vfd_swmr_writer = TRUE;
+    my_config->writer = TRUE;
     my_config->md_pages_reserved = 256;
     HDstrcpy(my_config->md_file_path, MD_FILENAME);
 
@@ -1075,7 +1075,7 @@ test_reader_md_concur(void)
     config_writer->version = H5F__CURR_VFD_SWMR_CONFIG_VERSION;
     config_writer->tick_len = 1; 
     config_writer->max_lag = 3;
-    config_writer->vfd_swmr_writer = TRUE;
+    config_writer->writer = TRUE;
     config_writer->md_pages_reserved = 256;
     HDstrcpy(config_writer->md_file_path, MD_FILENAME);
 
@@ -1160,7 +1160,7 @@ test_reader_md_concur(void)
         config_reader->version = H5F__CURR_VFD_SWMR_CONFIG_VERSION;
         config_reader->tick_len = 1;
         config_reader->max_lag = 3;
-        config_reader->vfd_swmr_writer = FALSE;
+        config_reader->writer = FALSE;
         config_reader->md_pages_reserved = 256;
         HDstrcpy(config_reader->md_file_path, MD_FILENAME);
 
diff --git a/test/vfd_swmr_addrem_writer.c b/test/vfd_swmr_addrem_writer.c
index 24285d3..ecf13ee 100644
--- a/test/vfd_swmr_addrem_writer.c
+++ b/test/vfd_swmr_addrem_writer.c
@@ -125,7 +125,7 @@ open_skeleton(const char *filename, unsigned verbose)
     config->version = H5F__CURR_VFD_SWMR_CONFIG_VERSION;
     config->tick_len = 4;
     config->max_lag = 5;
-    config->vfd_swmr_writer = TRUE;
+    config->writer = TRUE;
     config->md_pages_reserved = 128;
     HDstrcpy(config->md_file_path, "./my_md_file");
 
diff --git a/test/vfd_swmr_generator.c b/test/vfd_swmr_generator.c
index 3131f56..189330f 100644
--- a/test/vfd_swmr_generator.c
+++ b/test/vfd_swmr_generator.c
@@ -178,7 +178,7 @@ gen_skeleton(const char *filename, hbool_t verbose, hbool_t vfd_swmr_write,
         config->version = H5F__CURR_VFD_SWMR_CONFIG_VERSION;
         config->tick_len = 4;
         config->max_lag = 10;
-        config->vfd_swmr_writer = TRUE;
+        config->writer = TRUE;
         config->md_pages_reserved = 128; 
         HDstrcpy(config->md_file_path, "my_md_file");
 
diff --git a/test/vfd_swmr_reader.c b/test/vfd_swmr_reader.c
index 0308ee4..fe1d91f 100644
--- a/test/vfd_swmr_reader.c
+++ b/test/vfd_swmr_reader.c
@@ -311,7 +311,7 @@ read_records(const char *filename, hbool_t verbose, FILE *verbose_file,
     config->version = H5F__CURR_VFD_SWMR_CONFIG_VERSION;
     config->tick_len = 4;
     config->max_lag = 5;
-    config->vfd_swmr_writer = FALSE;
+    config->writer = FALSE;
     config->md_pages_reserved = 128;
     HDstrcpy(config->md_file_path, "./my_md_file");
 
diff --git a/test/vfd_swmr_remove_reader.c b/test/vfd_swmr_remove_reader.c
index 49c294e..a28889b 100644
--- a/test/vfd_swmr_remove_reader.c
+++ b/test/vfd_swmr_remove_reader.c
@@ -294,7 +294,7 @@ read_records(const char *filename, unsigned verbose, unsigned long nseconds,
     config->version = H5F__CURR_VFD_SWMR_CONFIG_VERSION;
     config->tick_len = 4;
     config->max_lag = 5;
-    config->vfd_swmr_writer = FALSE;
+    config->writer = FALSE;
     config->md_pages_reserved = 128;
     HDstrcpy(config->md_file_path, "./my_md_file");
 
diff --git a/test/vfd_swmr_remove_writer.c b/test/vfd_swmr_remove_writer.c
index 658cdbf..3b79a58 100644
--- a/test/vfd_swmr_remove_writer.c
+++ b/test/vfd_swmr_remove_writer.c
@@ -125,7 +125,7 @@ open_skeleton(const char *filename, unsigned verbose, unsigned old)
     config->version = H5F__CURR_VFD_SWMR_CONFIG_VERSION;
     config->tick_len = 4;
     config->max_lag = 5;
-    config->vfd_swmr_writer = TRUE;
+    config->writer = TRUE;
     config->md_pages_reserved = 128;
     HDstrcpy(config->md_file_path, "./my_md_file");
 
diff --git a/test/vfd_swmr_sparse_reader.c b/test/vfd_swmr_sparse_reader.c
index 4006c70..a602326 100644
--- a/test/vfd_swmr_sparse_reader.c
+++ b/test/vfd_swmr_sparse_reader.c
@@ -221,7 +221,7 @@ read_records(const char *filename, unsigned verbose, unsigned long nrecords,
     config->version = H5F__CURR_VFD_SWMR_CONFIG_VERSION;
     config->tick_len = 4;
     config->max_lag = 5;
-    config->vfd_swmr_writer = FALSE;
+    config->writer = FALSE;
     config->md_pages_reserved = 128;
     HDstrcpy(config->md_file_path, "./my_md_file");
 
diff --git a/test/vfd_swmr_sparse_writer.c b/test/vfd_swmr_sparse_writer.c
index 409970b..58de3f1 100644
--- a/test/vfd_swmr_sparse_writer.c
+++ b/test/vfd_swmr_sparse_writer.c
@@ -126,7 +126,7 @@ open_skeleton(const char *filename, unsigned verbose)
     config->version = H5F__CURR_VFD_SWMR_CONFIG_VERSION;
     config->tick_len = 4;
     config->max_lag = 5;
-    config->vfd_swmr_writer = TRUE;
+    config->writer = TRUE;
     config->md_pages_reserved = 128;
     HDstrcpy(config->md_file_path, "./my_md_file");
 
diff --git a/test/vfd_swmr_writer.c b/test/vfd_swmr_writer.c
index dbf1f80..2b0817b 100644
--- a/test/vfd_swmr_writer.c
+++ b/test/vfd_swmr_writer.c
@@ -129,7 +129,7 @@ open_skeleton(const char *filename, hbool_t verbose, FILE *verbose_file,
     config->version = H5F__CURR_VFD_SWMR_CONFIG_VERSION;
     config->tick_len = 4;
     config->max_lag = 5;
-    config->vfd_swmr_writer = TRUE;
+    config->writer = TRUE;
     config->md_pages_reserved = 128;
     HDstrcpy(config->md_file_path, "./my_md_file");