From 6584f3a2b69b901900b9f267d62e06efbc15fec1 Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Thu, 25 Aug 2022 12:35:24 +0800 Subject: vim-patch:8.2.4289: warnings reported by MSVC Problem: Warnings reported by MSVC. Solution: Rename variables and other fixes. (Ken Takata, closes vim/vim#9689) https://github.com/vim/vim/commit/5411910c77cba85212963a2fb71d8c71f8a5d203 N/A patches for version.c: vim-patch:8.2.0091: compiler warnings for size_t / int types Problem: Compiler warnings for size_t / int types. Solution: Change type to size_t. (Mike Williams) https://github.com/vim/vim/commit/4d7a248b644b647340ed1a25729e2ed586a54864 vim-patch:8.2.1299: compiler warning for using size_t for int and void pointer Problem: Compiler warning for using size_t for int and void pointer. Solution: Add type casts. https://github.com/vim/vim/commit/d3bb6a82a51d549bbd597bb4e94d8f074009be2a vim-patch:8.2.1906: warning for signed/unsigned Problem: Warning for signed/unsigned. Solution: Use size_t instead of int. (Mike Williams) https://github.com/vim/vim/commit/a360dbe3b63bdca93bbf8cc431578a446e8ce14c vim-patch:8.2.4531: LGTM warnings for condition and buffer size Problem: LGTM warnings for condition always true and buffer size too small. Solution: Remove the useless condition. Make the buffer larger. (Goc Dundar, closes vim/vim#9914) https://github.com/vim/vim/commit/f01a653ac50bb3542c24d26bb3fa5371cc3b2ed7 vim-patch:8.2.4624: old Coverity warning for resource leak Problem: Old Coverity warning for resource leak. Solution: Close the file if memory allocation fails. https://github.com/vim/vim/commit/5d46dcfeed4fcbbab371e17e1072b0cc9abe5217 vim-patch:9.0.0129: compiler warning for int/size_t usage Problem: Compiler warning for int/size_t usage. Solution: Add a type cast. (Mike Williams, closes vim/vim#10830) https://github.com/vim/vim/commit/ab146dac6b4148e770eb2bf61c72ef62d3ecfc65 --- src/nvim/cmdexpand.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/nvim/cmdexpand.c') diff --git a/src/nvim/cmdexpand.c b/src/nvim/cmdexpand.c index 5a53175b4a..50a84595fc 100644 --- a/src/nvim/cmdexpand.c +++ b/src/nvim/cmdexpand.c @@ -1939,13 +1939,12 @@ static int ExpandFromContext(expand_T *xp, char_u *pat, int *num_file, char ***f || xp->xp_context == EXPAND_FILES_IN_PATH) { // Expand file or directory names. bool free_pat = false; - int i; // for ":set path=" and ":set tags=" halve backslashes for escaped space if (xp->xp_backslash != XP_BS_NONE) { free_pat = true; pat = vim_strsave(pat); - for (i = 0; pat[i]; i++) { + for (int i = 0; pat[i]; i++) { if (pat[i] == '\\') { if (xp->xp_backslash == XP_BS_THREE && pat[i + 1] == '\\' @@ -1979,8 +1978,8 @@ static int ExpandFromContext(expand_T *xp, char_u *pat, int *num_file, char ***f } #ifdef BACKSLASH_IN_FILENAME if (p_csl[0] != NUL && (options & WILD_IGNORE_COMPLETESLASH) == 0) { - for (int i = 0; i < *num_file; i++) { - char_u *ptr = (*file)[i]; + for (int j = 0; j < *num_file; j++) { + char_u *ptr = (*file)[j]; while (*ptr != NUL) { if (p_csl[0] == 's' && *ptr == '\\') { *ptr = '/'; -- cgit