diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/fileio.c | 12 | ||||
| -rw-r--r-- | src/nvim/os/fs.c | 2 | ||||
| -rw-r--r-- | src/nvim/os_unix.c | 2 | ||||
| -rw-r--r-- | src/nvim/path.c | 2 |
4 files changed, 9 insertions, 9 deletions
diff --git a/src/nvim/fileio.c b/src/nvim/fileio.c index daff9aa4c6..264032758f 100644 --- a/src/nvim/fileio.c +++ b/src/nvim/fileio.c @@ -2714,7 +2714,7 @@ buf_write ( */ if (os_fileinfo_hardlinks(&file_info_old) > 1 || !os_fileinfo_link((char *)fname, &file_info) - || !os_file_info_id_equal(&file_info, &file_info_old)) { + || !os_fileinfo_id_equal(&file_info, &file_info_old)) { backup_copy = TRUE; } else # endif @@ -2764,7 +2764,7 @@ buf_write ( /* Symlinks. */ if ((bkc_flags & BKC_BREAKSYMLINK) && file_info_link_ok - && !os_file_info_id_equal(&file_info, &file_info_old)) { + && !os_fileinfo_id_equal(&file_info, &file_info_old)) { backup_copy = FALSE; } @@ -2772,7 +2772,7 @@ buf_write ( if ((bkc_flags & BKC_BREAKHARDLINK) && os_fileinfo_hardlinks(&file_info_old) > 1 && (!file_info_link_ok - || os_file_info_id_equal(&file_info, &file_info_old))) { + || os_fileinfo_id_equal(&file_info, &file_info_old))) { backup_copy = FALSE; } # endif @@ -2844,7 +2844,7 @@ buf_write ( * link). If we don't check here, we either ruin the file when * copying or erase it after writing. */ - if (os_file_info_id_equal(&file_info_new, &file_info_old)) { + if (os_fileinfo_id_equal(&file_info_new, &file_info_old)) { free(backup); backup = NULL; /* no backup file to delete */ } @@ -3203,7 +3203,7 @@ nobackup: /* Don't delete the file when it's a hard or symbolic link. */ if ((!newfile && os_fileinfo_hardlinks(&file_info) > 1) || (os_fileinfo_link((char *)fname, &file_info) - && !os_file_info_id_equal(&file_info, &file_info_old))) { + && !os_fileinfo_id_equal(&file_info, &file_info_old))) { errmsg = (char_u *)_("E166: Can't open linked file for writing"); } else #endif @@ -4545,7 +4545,7 @@ int vim_rename(char_u *from, char_u *to) // filesystem. In that case go through a temp file name. FileInfo to_info; if (os_fileinfo((char *)to, &to_info) - && os_file_info_id_equal(&from_info, &to_info)) { + && os_fileinfo_id_equal(&from_info, &to_info)) { use_tmp_file = true; } diff --git a/src/nvim/os/fs.c b/src/nvim/os/fs.c index 217d0a78ac..908106db54 100644 --- a/src/nvim/os/fs.c +++ b/src/nvim/os/fs.c @@ -367,7 +367,7 @@ bool os_fileinfo_fd(int file_descriptor, FileInfo *file_info) /// Compare the inodes of two FileInfos /// /// @return `true` if the two FileInfos represent the same file. -bool os_file_info_id_equal(const FileInfo *file_info_1, +bool os_fileinfo_id_equal(const FileInfo *file_info_1, const FileInfo *file_info_2) { return file_info_1->stat.st_ino == file_info_2->stat.st_ino diff --git a/src/nvim/os_unix.c b/src/nvim/os_unix.c index e6a1ecb796..3fa8b803b2 100644 --- a/src/nvim/os_unix.c +++ b/src/nvim/os_unix.c @@ -355,7 +355,7 @@ int len /* buffer size, only used when name gets longer */ MAXPATHL - (tail - name) + 1); FileInfo file_info_new; if (os_fileinfo_link((char *)newname, &file_info_new) - && os_file_info_id_equal(&file_info, &file_info_new)) { + && os_fileinfo_id_equal(&file_info, &file_info_new)) { STRCPY(tail, dp->d_name); break; } diff --git a/src/nvim/path.c b/src/nvim/path.c index 8b4a63a6ae..4988849b59 100644 --- a/src/nvim/path.c +++ b/src/nvim/path.c @@ -1351,7 +1351,7 @@ void simplify_filename(char_u *filename) *p = saved_char; } - if (!os_file_info_id_equal(&file_info, &new_file_info)) { + if (!os_fileinfo_id_equal(&file_info, &new_file_info)) { do_strip = FALSE; /* We don't disable stripping of later * components since the unstripped path name is |