From fb7285b5d7ebf572849a3e742241c3a84c721bb8 Mon Sep 17 00:00:00 2001 From: Jan Edmund Lazo Date: Sat, 5 Dec 2020 22:16:13 -0500 Subject: vim-patch:8.1.2064: MS-Windows: compiler warnings for unused arguments Problem: MS-Windows: compiler warnings for unused arguments. Solution: Add UNUSED. (Yegappan Lakshmanan, closes vim/vim#4963) https://github.com/vim/vim/commit/bd67aac279adf3a1cfa11557229b44e4c2c3dcda N/A patches for version.c: vim-patch:8.1.0818: MS-Windows: cannot send large data with ch_sendraw() Problem: MS-Windows: cannot send large data with ch_sendraw(). Solution: Split write into several WriteFile() calls. (Yasuhiro Matsumoto, closes vim/vim#3823) https://github.com/vim/vim/commit/240583869ae477202494dd01ef1e8e2bac650f10 vim-patch:8.1.1131: getwinpos() does not work in the MS-Windows console Problem: getwinpos() does not work in the MS-Windows console. Solution: Implement getwinpos(). https://github.com/vim/vim/commit/16c34c37659e6afca74169969bdacb6b866548c9 vim-patch:8.2.0587: compiler warning for unused variable Problem: Compiler warning for unused variable. Solution: Add UNUSED. https://github.com/vim/vim/commit/21cfe500f322a0bea3367c677943ea6c57c282b9 vim-patch:8.2.0879: compiler warning for unused function argument Problem: Compiler warning for unused function argument. Solution: Add UNUSED. https://github.com/vim/vim/commit/f9ca08e95ff5b66a02c75334264dd86508b2a453 vim-patch:8.2.2104: build problem with Ruby 2.7 Problem: Build problem with Ruby 2.7. Solution: Adjust function declarations. (Ozaki Kiichi, closes vim/vim#7430) https://github.com/vim/vim/commit/d5a986f460019a924627d79350552f446505cffb --- src/nvim/ex_getln.c | 3 ++- src/nvim/undo.c | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/nvim/ex_getln.c b/src/nvim/ex_getln.c index ed408c28e5..a0910f1394 100644 --- a/src/nvim/ex_getln.c +++ b/src/nvim/ex_getln.c @@ -4327,7 +4327,8 @@ void ExpandEscape(expand_T *xp, char_u *str, int numfiles, char_u **files, int o /// if true then it escapes for a shell command. /// /// @return [allocated] escaped file name. -char *vim_strsave_fnameescape(const char *const fname, const bool shell) +char *vim_strsave_fnameescape(const char *const fname, + const bool shell FUNC_ATTR_UNUSED) FUNC_ATTR_NONNULL_RET FUNC_ATTR_MALLOC FUNC_ATTR_NONNULL_ALL { #ifdef BACKSLASH_IN_FILENAME diff --git a/src/nvim/undo.c b/src/nvim/undo.c index a8b8f7aa50..636d00bbbf 100644 --- a/src/nvim/undo.c +++ b/src/nvim/undo.c @@ -1255,7 +1255,8 @@ theend: /// a bit more verbose. /// Otherwise use curbuf->b_ffname to generate the undo file name. /// "hash[UNDO_HASH_SIZE]" must be the hash value of the buffer text. -void u_read_undo(char *name, char_u *hash, char_u *orig_name) +void u_read_undo(char *name, const char_u *hash, + const char_u *orig_name FUNC_ATTR_UNUSED) FUNC_ATTR_NONNULL_ARG(2) { u_header_T **uhp_table = NULL; @@ -1273,7 +1274,7 @@ void u_read_undo(char *name, char_u *hash, char_u *orig_name) // owner of the text file or equal to the current user. FileInfo file_info_orig; FileInfo file_info_undo; - if (os_fileinfo((char *)orig_name, &file_info_orig) + if (os_fileinfo((const char *)orig_name, &file_info_orig) && os_fileinfo((char *)file_name, &file_info_undo) && file_info_orig.stat.st_uid != file_info_undo.stat.st_uid && file_info_undo.stat.st_uid != getuid()) { -- cgit