1) Fix spelling errors

2) Fix couple routine names due to FUNC_ENTER_PACKAGE.

2 files changed, 12 insertions, 12 deletions

diff --git a/src/H5FDpublic.h b/src/H5FDpublic.h
index d232200..9411874 100644
--- a/src/H5FDpublic.h
+++ b/src/H5FDpublic.h
@@ -182,7 +182,7 @@
 /*
  * Defining H5FD_FEAT_SUPPORTS_VFD_SWMR for a VFL driver means that the
  * driver supports the SWMR feature that is implemented in a more modular
- * fashion and simplies maintenance.
+ * fashion and simplifies maintenance.
  */
 #define H5FD_FEAT_SUPPORTS_VFD_SWMR 0x00020000
 
diff --git a/src/H5FDvfd_swmr.c b/src/H5FDvfd_swmr.c
index ab74613..0731f30 100644
--- a/src/H5FDvfd_swmr.c
+++ b/src/H5FDvfd_swmr.c
@@ -272,7 +272,7 @@ done:
 
 /*-------------------------------------------------------------------------
  *
- * Function:    H5FD_vfd_swmr_build_md_path_name
+ * Function:    H5FD__vfd_swmr_build_md_path_name
  *
  * Purpose:     To construct the metadata file's full name based on config's 
  *              md_file_path and md_file_name.  See RFC for details.
@@ -286,7 +286,7 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t 
-H5FD_vfd_swmr_build_md_path_name(H5F_vfd_swmr_config_t *config, const char *hdf5_filename, char *name /*out*/)
+H5FD__vfd_swmr_build_md_path_name(H5F_vfd_swmr_config_t *config, const char *hdf5_filename, char *name /*out*/)
 {
     size_t          tot_len = 0;
     size_t          tmp_len = 0;
@@ -305,12 +305,12 @@ H5FD_vfd_swmr_build_md_path_name(H5F_vfd_swmr_config_t *config, const char *hdf5
 
     if((tmp_len = HDstrlen(config->md_file_name)) != 0) {
         if((tot_len += tmp_len) > H5F__MAX_VFD_SWMR_FILE_NAME_LEN)
-            HGOTO_ERROR(H5E_FILE, H5E_CANTCOPY, FAIL, "md_file_path and md_file_name exceeds maxiumum");
+            HGOTO_ERROR(H5E_FILE, H5E_CANTCOPY, FAIL, "md_file_path and md_file_name exceeds maximum");
         HDstrcat(name, config->md_file_name);
     } else {
         /* Automatic generation of metadata file name based on hdf5_filename + '.md' */
         if((tot_len += (HDstrlen(hdf5_filename) + 3)) > H5F__MAX_VFD_SWMR_FILE_NAME_LEN)
-            HGOTO_ERROR(H5E_FILE, H5E_CANTCOPY, FAIL, "md_file_path and md_file_name maxiumum");
+            HGOTO_ERROR(H5E_FILE, H5E_CANTCOPY, FAIL, "md_file_path and md_file_name maximum");
 
         HDstrcat(name, hdf5_filename);
         HDstrcat(name, VFD_SWMR_MD_SUFFIX);
@@ -320,10 +320,10 @@ done:
 
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5FD_vfd_swmr_build_md_path_name() */
+} /* H5FD__vfd_swmr_build_md_path_name() */
 
 /*-------------------------------------------------------------------------
- * Function:    H5FD_vfd_swmr_create_make_believe_data
+ * Function:    H5FD__vfd_swmr_create_make_believe_data
  *
  * Purpose:     Set up pretend data when make_believe is true
  *
@@ -334,7 +334,7 @@ done:
  *-------------------------------------------------------------------------
  */
 static void
-H5FD_vfd_swmr_create_make_believe_data(H5FD_vfd_swmr_t *_file)
+H5FD__vfd_swmr_create_make_believe_data(H5FD_vfd_swmr_t *_file)
 {
     H5FD_vfd_swmr_t *file = (H5FD_vfd_swmr_t *)_file;
 
@@ -353,7 +353,7 @@ H5FD_vfd_swmr_create_make_believe_data(H5FD_vfd_swmr_t *_file)
 
     FUNC_LEAVE_NOAPI_VOID
 
-}  /* H5FD_vfd_swmr_create_make_believe_data() */
+}  /* H5FD__vfd_swmr_create_make_believe_data() */
 
 /*-------------------------------------------------------------------------
  * Function:    H5FD__vfd_swmr_open
@@ -417,7 +417,7 @@ H5FD__vfd_swmr_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t max
     file->hdf5_filename[sizeof(file->hdf5_filename) - 1] = '\0';
 
     /* Retain a copy of the metadata file name */
-    if(H5FD_vfd_swmr_build_md_path_name(vfd_swmr_config, name, file->md_file_path_name) < 0)
+    if(H5FD__vfd_swmr_build_md_path_name(vfd_swmr_config, name, file->md_file_path_name) < 0)
         HGOTO_ERROR(H5E_VFL, H5E_OPENERROR, NULL, "building md_file_path and md_file_name failed")
     
     file->md_file_path_name[sizeof(file->md_file_path_name) - 1] = '\0';
@@ -435,7 +435,7 @@ H5FD__vfd_swmr_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t max
             is_hdf5 == TRUE) {
 
             file->make_believe = TRUE;
-            H5FD_vfd_swmr_create_make_believe_data(file);
+            H5FD__vfd_swmr_create_make_believe_data(file);
         }
         if (H5FD__swmr_reader_open(file) < 0)
             HGOTO_ERROR(H5E_VFL, H5E_OPENERROR, NULL, "perform reader-specific opening steps failed")
@@ -573,7 +573,7 @@ H5FD__vfd_swmr_cmp(const H5FD_t *_f1, const H5FD_t *_f2)
     ret_value = H5FD_cmp(f1->hdf5_file_lf, f2->hdf5_file_lf);
 
     FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5FD_vfd__swmr_cmp() */
+} /* end H5FD__vfd__swmr_cmp() */
 
 /*-------------------------------------------------------------------------
  * Function:    H5FD_vfd_swmr_dedup (original description with H5P_FILE_ACCESS_ANY_VFD)