1 files changed, 24 insertions, 27 deletions

diff --git a/src/nvim/fileio.c b/src/nvim/fileio.c
index 1a6c85abaa..23292ff4ac 100644
--- a/src/nvim/fileio.c
+++ b/src/nvim/fileio.c
@@ -3368,16 +3368,16 @@ restore_backup:
     nchars += len;
   }
 
-#if defined(UNIX) && defined(HAVE_FSYNC)
-  /* On many journalling file systems there is a bug that causes both the
-   * original and the backup file to be lost when halting the system right
-   * after writing the file.  That's because only the meta-data is
-   * journalled.  Syncing the file slows down the system, but assures it has
-   * been written to disk and we don't lose it.
-   * For a device do try the fsync() but don't complain if it does not work
-   * (could be a pipe).
-   * If the 'fsync' option is FALSE, don't fsync().  Useful for laptops. */
-  if (p_fs && fsync(fd) != 0 && !device) {
+#if defined(UNIX)
+  // On many journalling file systems there is a bug that causes both the
+  // original and the backup file to be lost when halting the system right
+  // after writing the file.  That's because only the meta-data is
+  // journalled.  Syncing the file slows down the system, but assures it has
+  // been written to disk and we don't lose it.
+  // For a device do try the fsync() but don't complain if it does not work
+  // (could be a pipe).
+  // If the 'fsync' option is FALSE, don't fsync().  Useful for laptops.
+  if (p_fs && os_fsync(fd) != 0 && !device) {
     errmsg = (char_u *)_("E667: Fsync failed");
     end = 0;
   }
@@ -7096,26 +7096,23 @@ int match_file_list(char_u *list, char_u *sfname, char_u *ffname)
   return FALSE;
 }
 
-/*
- * Convert the given pattern "pat" which has shell style wildcards in it, into
- * a regular expression, and return the result in allocated memory.  If there
- * is a directory path separator to be matched, then TRUE is put in
- * allow_dirs, otherwise FALSE is put there -- webb.
- * Handle backslashes before special characters, like "\*" and "\ ".
- *
- * Returns NULL on failure.
- */
-char_u *
-file_pat_to_reg_pat (
-    char_u *pat,
-    char_u *pat_end,           /* first char after pattern or NULL */
-    char *allow_dirs,        /* Result passed back out in here */
-    int no_bslash             /* Don't use a backward slash as pathsep */
+/// Convert the given pattern "pat" which has shell style wildcards in it, into
+/// a regular expression, and return the result in allocated memory.  If there
+/// is a directory path separator to be matched, then TRUE is put in
+/// allow_dirs, otherwise FALSE is put there -- webb.
+/// Handle backslashes before special characters, like "\*" and "\ ".
+///
+/// Returns NULL on failure.
+char_u * file_pat_to_reg_pat(
+    const char_u *pat,
+    const char_u *pat_end,   // first char after pattern or NULL
+    char *allow_dirs,        // Result passed back out in here
+    int no_bslash            // Don't use a backward slash as pathsep
 )
 {
-  char_u      *endp;
+  const char_u *endp;
   char_u      *reg_pat;
-  char_u      *p;
+  const char_u *p;
   int nested = 0;
   int add_dollar = TRUE;