mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-15 06:16:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

fileid: rename os_file_id_equal

Browse Source
This commit is contained in:
Stefan Hoffmann
2014-08-27 20:12:11 +02:00
parent 4e43095ab2
commit 3cf7a17a44
7 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/nvim/buffer.c
View File

@@ -2441,7 +2441,7 @@ void buf_set_file_id(buf_T *buf)
static bool buf_same_file_id(buf_T *buf, FileID *file_id)
{
return buf->file_id_valid
&& os_file_id_equal(&(buf->file_id), file_id);
&& os_fileid_equal(&(buf->file_id), file_id);
}
/*

2
src/nvim/ex_cmds2.c
View File

@@ -2423,7 +2423,7 @@ do_source (
// Compare dev/ino when possible, it catches symbolic links.
// Also compare file names, the inode may change when the file was edited.
bool file_id_equal = file_id_ok && si->file_id_valid
&& os_file_id_equal(&(si->file_id), &file_id);
&& os_fileid_equal(&(si->file_id), &file_id);
if (si->sn_name != NULL
&& (file_id_equal || fnamecmp(si->sn_name, fname_exp) == 0)) {
break;

2
src/nvim/file_search.c
View File

@@ -1106,7 +1106,7 @@ static int ff_check_visited(ff_visited_T **visited_list, char_u *fname, char_u *
for (vp = *visited_list; vp != NULL; vp = vp->ffv_next) {
if ((url && fnamecmp(vp->ffv_fname, ff_expand_buffer) == 0)
|| (!url && vp->file_id_valid
&& os_file_id_equal(&(vp->file_id), &file_id))) {
&& os_fileid_equal(&(vp->file_id), &file_id))) {
/* are the wildcard parts equal */
if (ff_wc_equal(vp->ffv_wc_path, wc_path) == TRUE)
/* already visited */

2
src/nvim/if_cscope.c
View File

@@ -1181,7 +1181,7 @@ static int cs_insert_filelist(char *fname, char *ppath, char *flags,
i = -1; /* can be set to the index of an empty item in csinfo */
for (j = 0; j < csinfo_size; j++) {
if (csinfo[j].fname != NULL
&& os_file_id_equal_file_info(&(csinfo[j].file_id), file_info)) {
&& os_fileid_equal_file_info(&(csinfo[j].file_id), file_info)) {
if (p_csverbose)
(void)EMSG(_("E568: duplicate cscope database not added"));
return -1;

4
src/nvim/os/fs.c
View File

@@ -442,7 +442,7 @@ bool os_fileid(const char *path, FileID *file_id)
/// @param file_id_1 Pointer to first `FileID`
/// @param file_id_2 Pointer to second `FileID`
/// @return `true` if the two `FileID`s represent te same file.
bool os_file_id_equal(const FileID *file_id_1, const FileID *file_id_2)
bool os_fileid_equal(const FileID *file_id_1, const FileID *file_id_2)
{
return file_id_1->inode == file_id_2->inode
&& file_id_1->device_id == file_id_2->device_id;
@@ -453,7 +453,7 @@ bool os_file_id_equal(const FileID *file_id_1, const FileID *file_id_2)
/// @param file_id Pointer to a `FileID`
/// @param file_info Pointer to a `FileInfo`
/// @return `true` if the `FileID` and the `FileInfo` represent te same file.
bool os_file_id_equal_file_info(const FileID *file_id,
bool os_fileid_equal_file_info(const FileID *file_id,
const FileInfo *file_info)
{
return file_id->inode == file_info->stat.st_ino

2
src/nvim/path.c
View File

@@ -77,7 +77,7 @@ FileComparison path_full_compare(char_u *s1, char_u *s2, int checkname)
if (!id_ok_1 || !id_ok_2) {
return kOneFileMissing;
}
if (os_file_id_equal(&file_id_1, &file_id_2)) {
if (os_fileid_equal(&file_id_1, &file_id_2)) {
return kEqualFiles;
}
return kDifferentFiles;