# HG changeset patch # User Bram Moolenaar # Date 1643469303 -3600 # Node ID c1da76214cca5f800b9e698876719fc0e6233422 # Parent e9fd35153b02af037df79a1bce570986625c2f6c patch 8.2.4254: using short instead of int Commit: https://github.com/vim/vim/commit/f12b7815f6b55c3e2f37366aa45e723b1fcb2e9a Author: =?UTF-8?q?Dundar=20G=C3=B6c?= Date: Sat Jan 29 15:12:39 2022 +0000 patch 8.2.4254: using short instead of int Problem: Using short instead of int. Solution: Use int. (closes https://github.com/vim/vim/issues/9658) diff --git a/src/if_cscope.c b/src/if_cscope.c --- a/src/if_cscope.c +++ b/src/if_cscope.c @@ -675,14 +675,12 @@ cs_check_for_tags(void) static int cs_cnt_connections(void) { - short i; - short cnt = 0; + int i; + int cnt = 0; for (i = 0; i < csinfo_size; i++) - { if (csinfo[i].fname != NULL) cnt++; - } return cnt; } @@ -1358,7 +1356,8 @@ cs_insert_filelist( char *flags, stat_T *sb UNUSED) { - short i, j; + int i; + int j; #ifndef UNIX BY_HANDLE_FILE_INFORMATION bhfi; @@ -1522,7 +1521,7 @@ cs_lookup_cmd(exarg_T *eap) cs_kill(exarg_T *eap UNUSED) { char *stok; - short i; + int i; if ((stok = strtok((char *)NULL, (const char *)" ")) == NULL) { @@ -2456,7 +2455,8 @@ cs_resolve_file(int i, char *name) static int cs_show(exarg_T *eap UNUSED) { - short i; + int i; + if (cs_cnt_connections() == 0) msg_puts(_("no cscope connections\n")); else diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -751,6 +751,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 4254, +/**/ 4253, /**/ 4252,