From 5d074a0aa6b307a11ee572db6bf48ca17c3a8a23 Mon Sep 17 00:00:00 2001 From: Stefan Hoffmann Date: Wed, 27 Aug 2014 19:14:44 +0200 Subject: fileinfo: rename os_get_file_info{,_link,_fd} --- src/nvim/path.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/nvim/path.c') diff --git a/src/nvim/path.c b/src/nvim/path.c index 0c18ab7bd4..8b4a63a6ae 100644 --- a/src/nvim/path.c +++ b/src/nvim/path.c @@ -1304,7 +1304,7 @@ void simplify_filename(char_u *filename) saved_char = p[-1]; p[-1] = NUL; FileInfo file_info; - if (!os_get_file_info_link((char *)filename, &file_info)) { + if (!os_fileinfo_link((char *)filename, &file_info)) { do_strip = TRUE; } p[-1] = saved_char; @@ -1327,7 +1327,7 @@ void simplify_filename(char_u *filename) * components. */ saved_char = *tail; *tail = NUL; - if (os_get_file_info((char *)filename, &file_info)) { + if (os_fileinfo((char *)filename, &file_info)) { do_strip = TRUE; } else @@ -1343,11 +1343,11 @@ void simplify_filename(char_u *filename) * component's parent directory.) */ FileInfo new_file_info; if (p == start && relative) { - os_get_file_info(".", &new_file_info); + os_fileinfo(".", &new_file_info); } else { saved_char = *p; *p = NUL; - os_get_file_info((char *)filename, &new_file_info); + os_fileinfo((char *)filename, &new_file_info); *p = saved_char; } -- cgit From edcc1a97327c68c7ae1353281784c47e026d6674 Mon Sep 17 00:00:00 2001 From: Stefan Hoffmann Date: Wed, 27 Aug 2014 19:53:31 +0200 Subject: fileinfo: rename os_file_info_id_equal --- src/nvim/path.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/nvim/path.c') 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 -- cgit From 4e43095ab20d2b03b206f1b019570873af35c68c Mon Sep 17 00:00:00 2001 From: Stefan Hoffmann Date: Wed, 27 Aug 2014 20:09:39 +0200 Subject: fileid: rename os_get_file_id --- src/nvim/path.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/nvim/path.c') diff --git a/src/nvim/path.c b/src/nvim/path.c index 4988849b59..a417f417c4 100644 --- a/src/nvim/path.c +++ b/src/nvim/path.c @@ -61,10 +61,10 @@ FileComparison path_full_compare(char_u *s1, char_u *s2, int checkname) FileID file_id_1, file_id_2; expand_env(s1, exp1, MAXPATHL); - bool id_ok_1 = os_get_file_id((char *)exp1, &file_id_1); - bool id_ok_2 = os_get_file_id((char *)s2, &file_id_2); + bool id_ok_1 = os_fileid((char *)exp1, &file_id_1); + bool id_ok_2 = os_fileid((char *)s2, &file_id_2); if (!id_ok_1 && !id_ok_2) { - // If os_get_file_id() doesn't work, may compare the names. + // If os_fileid() doesn't work, may compare the names. if (checkname) { vim_FullName(exp1, full1, MAXPATHL, FALSE); vim_FullName(s2, full2, MAXPATHL, FALSE); -- cgit From 3cf7a17a4452cc8ae42104459992a8e73963084e Mon Sep 17 00:00:00 2001 From: Stefan Hoffmann Date: Wed, 27 Aug 2014 20:12:11 +0200 Subject: fileid: rename os_file_id_equal --- src/nvim/path.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/nvim/path.c') diff --git a/src/nvim/path.c b/src/nvim/path.c index a417f417c4..4e05c506f8 100644 --- a/src/nvim/path.c +++ b/src/nvim/path.c @@ -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; -- cgit