summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author=?UTF-8?q?Dundar=20G=C3=B6c?= <gocdundar@gmail.com>2022-01-29 15:12:39 +0000
committerBram Moolenaar <Bram@vim.org>2022-01-29 15:12:39 +0000
commitf12b7815f6b55c3e2f37366aa45e723b1fcb2e9a (patch)
treedcb14a03f0f260b1a66e6600ef88737835c76f80
parent37f47958b8a2a44abc60614271d9537e7f14e51a (diff)
downloadvim-git-f12b7815f6b55c3e2f37366aa45e723b1fcb2e9a.tar.gz
patch 8.2.4254: using short instead of intv8.2.4254
Problem: Using short instead of int. Solution: Use int. (closes #9658)
-rw-r--r--src/if_cscope.c14
-rw-r--r--src/version.c2
2 files changed, 9 insertions, 7 deletions
diff --git a/src/if_cscope.c b/src/if_cscope.c
index edcd4ca68..f8d4dc6df 100644
--- 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
index 25dcfe316..25f858bcb 100644
--- 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,