From 6bb220be117face75cf1e95ab91a4d49acec1c5f Mon Sep 17 00:00:00 2001
From: Dana Robinson <derobins@hdfgroup.org>
Date: Mon, 18 Mar 2024 00:18:11 -0700
Subject: [PATCH] Rename Windows open/remove functions

---
 src/H5system.c    | 18 ++++++++++--------
 src/H5win32defs.h | 12 ++++++------
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/src/H5system.c b/src/H5system.c
index 406166a19c0..8f5b6f451d1 100644
--- a/src/H5system.c
+++ b/src/H5system.c
@@ -514,16 +514,17 @@ H5_get_utf16_str(const char *s)
 } /* end H5_get_utf16_str() */
 
 /*-------------------------------------------------------------------------
- * Function:     Wopen_utf8
+ * Function:     Wopen
  *
- * Purpose:      UTF-8 equivalent of open(2) for use on Windows
+ * Purpose:      Equivalent of open(2) for use on Windows. Necessary to
+ *               handle code pages and Unicode on that platform.
  *
  * Return:       Success:    A POSIX file descriptor
  *               Failure:    -1
  *-------------------------------------------------------------------------
  */
 int
-Wopen_utf8(const char *path, int oflag, ...)
+Wopen(const char *path, int oflag, ...)
 {
     int      fd    = -1;   /* POSIX file descriptor to be returned */
     wchar_t *wpath = NULL; /* UTF-16 version of the path */
@@ -573,19 +574,20 @@ Wopen_utf8(const char *path, int oflag, ...)
     H5MM_xfree(wpath);
 
     return fd;
-} /* end Wopen_utf8() */
+} /* end Wopen() */
 
 /*-------------------------------------------------------------------------
- * Function:     Wremove_utf8
+ * Function:     Wremove
  *
- * Purpose:      UTF-8 equivalent of remove(3) for use on Windows.
+ * Purpose:      Equivalent of remove(3) for use on Windows. Necessary to
+ *               handle code pages and Unicode on that platform.
  *
  * Return:       Success:    0
  *               Failure:    -1
  *-------------------------------------------------------------------------
  */
 int
-Wremove_utf8(const char *path)
+Wremove(const char *path)
 {
     wchar_t *wpath = NULL; /* UTF-16 version of the path */
     int      ret   = -1;
@@ -619,7 +621,7 @@ Wremove_utf8(const char *path)
     H5MM_xfree(wpath);
 
     return ret;
-} /* end Wremove_utf8() */
+} /* end Wremove() */
 
 #endif /* H5_HAVE_WIN32_API */
 
diff --git a/src/H5win32defs.h b/src/H5win32defs.h
index 9630c5e2d42..05d291ec03b 100644
--- a/src/H5win32defs.h
+++ b/src/H5win32defs.h
@@ -39,7 +39,7 @@ struct timezone {
 };
 #endif
 
-#define HDcreat(S, M)        Wopen_utf8(S, O_CREAT | O_TRUNC | O_RDWR, M)
+#define HDcreat(S, M)        Wopen(S, O_CREAT | O_TRUNC | O_RDWR, M)
 #define HDflock(F, L)        Wflock(F, L)
 #define HDfstat(F, B)        _fstati64(F, B)
 #define HDftell(F)           _ftelli64(F)
@@ -59,13 +59,13 @@ struct timezone {
  */
 #if (defined(_MSC_VER) && !defined(_MSVC_TRADITIONAL)) || _MSVC_TRADITIONAL
 /* Using the MSVC traditional preprocessor */
-#define HDopen(S, F, ...) Wopen_utf8(S, F, __VA_ARGS__)
+#define HDopen(S, F, ...) Wopen(S, F, __VA_ARGS__)
 #else
 /* Using a standards conformant preprocessor */
-#define HDopen(S, F, ...) Wopen_utf8(S, F, ##__VA_ARGS__)
+#define HDopen(S, F, ...) Wopen(S, F, ##__VA_ARGS__)
 #endif
 
-#define HDremove(S)           Wremove_utf8(S)
+#define HDremove(S)           Wremove(S)
 #define HDsetenv(N, V, O)     Wsetenv(N, V, O)
 #define HDsetvbuf(F, S, M, Z) setvbuf(F, S, M, (Z > 1 ? Z : 2))
 #define HDsleep(S)            Sleep(S * 1000)
@@ -89,8 +89,8 @@ H5_DLL int      Wsetenv(const char *name, const char *value, int overwrite);
 H5_DLL int      Wflock(int fd, int operation);
 H5_DLL herr_t   H5_expand_windows_env_vars(char **env_var);
 H5_DLL wchar_t *H5_get_utf16_str(const char *s);
-H5_DLL int      Wopen_utf8(const char *path, int oflag, ...);
-H5_DLL int      Wremove_utf8(const char *path);
+H5_DLL int      Wopen(const char *path, int oflag, ...);
+H5_DLL int      Wremove(const char *path);
 H5_DLL int      H5_get_win32_times(H5_timevals_t *tvs);
 H5_DLL char    *H5_strndup(const char *s, size_t n);
 H5_DLL char    *Wstrcasestr_wrap(const char *haystack, const char *needle);