diff options
author | Stefan Hoffmann <stefan991@gmail.com> | 2014-08-27 20:14:39 +0200 |
---|---|---|
committer | Stefan Hoffmann <stefan991@gmail.com> | 2014-08-31 15:47:43 +0200 |
commit | 10813ce38c6588664e1decc8ba35424923cfb2e4 (patch) | |
tree | 732bec8407f26bb1500490842dd8ed85a649da59 | |
parent | 3cf7a17a4452cc8ae42104459992a8e73963084e (diff) | |
download | rneovim-10813ce38c6588664e1decc8ba35424923cfb2e4.tar.gz rneovim-10813ce38c6588664e1decc8ba35424923cfb2e4.tar.bz2 rneovim-10813ce38c6588664e1decc8ba35424923cfb2e4.zip |
fileid: rename os_file_id_equal_file_info
-rw-r--r-- | src/nvim/if_cscope.c | 2 | ||||
-rw-r--r-- | src/nvim/os/fs.c | 2 | ||||
-rw-r--r-- | test/unit/os/fs_spec.lua | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/nvim/if_cscope.c b/src/nvim/if_cscope.c index 77e22901f8..667e6512f3 100644 --- a/src/nvim/if_cscope.c +++ b/src/nvim/if_cscope.c @@ -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_fileid_equal_file_info(&(csinfo[j].file_id), file_info)) { + && os_fileid_equal_fileinfo(&(csinfo[j].file_id), file_info)) { if (p_csverbose) (void)EMSG(_("E568: duplicate cscope database not added")); return -1; diff --git a/src/nvim/os/fs.c b/src/nvim/os/fs.c index c5dc7c8ece..df6491d57d 100644 --- a/src/nvim/os/fs.c +++ b/src/nvim/os/fs.c @@ -453,7 +453,7 @@ bool os_fileid_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_fileid_equal_file_info(const FileID *file_id, +bool os_fileid_equal_fileinfo(const FileID *file_id, const FileInfo *file_info) { return file_id->inode == file_info->stat.st_ino diff --git a/test/unit/os/fs_spec.lua b/test/unit/os/fs_spec.lua index ad90b17e56..9233ce02c7 100644 --- a/test/unit/os/fs_spec.lua +++ b/test/unit/os/fs_spec.lua @@ -680,14 +680,14 @@ describe('fs function', function() end) end) - describe('os_fileid_equal_file_info', function() + describe('os_fileid_equal_fileinfo', function() it('returns true if file_id and file_info represent the same file', function() local file_id = file_id_new() local file_info = file_info_new() local path = 'unit-test-directory/test.file' assert.is_true((fs.os_fileid(path, file_id))) assert.is_true((fs.os_fileinfo(path, file_info))) - assert.is_true((fs.os_fileid_equal_file_info(file_id, file_info))) + assert.is_true((fs.os_fileid_equal_fileinfo(file_id, file_info))) end) it('returns false if file_id and file_info represent different files', function() @@ -697,7 +697,7 @@ describe('fs function', function() local path_2 = 'unit-test-directory/test_2.file' assert.is_true((fs.os_fileid(path_1, file_id))) assert.is_true((fs.os_fileinfo(path_2, file_info))) - assert.is_false((fs.os_fileid_equal_file_info(file_id, file_info))) + assert.is_false((fs.os_fileid_equal_fileinfo(file_id, file_info))) end) end) end) |