mirror of
https://github.com/vim/vim.git
synced 2025-09-24 03:44:06 -04:00
patch 9.1.0274: MS-Windows: a few compiler warnings
Problem: MS-Windows: a few compiler warnings Solution: Change variable types to resolve compiler warnings (Mike Williams) Windows compiles were reporting a few size_t to signed integer conversion warnings that can be resolved by changing the variable declarations to be size_t to start with. closes: #14429 Signed-off-by: Mike Williams <mrmrdubya@gmail.com> Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
committed by
Christian Brabandt
parent
b78753db5f
commit
aca8f55596
@@ -81,7 +81,7 @@ static int KeyNoremap = 0; // remapping flags
|
|||||||
static char_u typebuf_init[TYPELEN_INIT]; // initial typebuf.tb_buf
|
static char_u typebuf_init[TYPELEN_INIT]; // initial typebuf.tb_buf
|
||||||
static char_u noremapbuf_init[TYPELEN_INIT]; // initial typebuf.tb_noremap
|
static char_u noremapbuf_init[TYPELEN_INIT]; // initial typebuf.tb_noremap
|
||||||
|
|
||||||
static int last_recorded_len = 0; // number of last recorded chars
|
static size_t last_recorded_len = 0; // number of last recorded chars
|
||||||
|
|
||||||
#ifdef FEAT_EVAL
|
#ifdef FEAT_EVAL
|
||||||
mapblock_T *last_used_map = NULL;
|
mapblock_T *last_used_map = NULL;
|
||||||
@@ -163,7 +163,7 @@ get_recorded(void)
|
|||||||
* (possibly mapped) characters that stopped the recording.
|
* (possibly mapped) characters that stopped the recording.
|
||||||
*/
|
*/
|
||||||
len = STRLEN(p);
|
len = STRLEN(p);
|
||||||
if ((int)len >= last_recorded_len)
|
if (len >= last_recorded_len)
|
||||||
{
|
{
|
||||||
len -= last_recorded_len;
|
len -= last_recorded_len;
|
||||||
p[len] = NUL;
|
p[len] = NUL;
|
||||||
@@ -1789,7 +1789,7 @@ vgetc(void)
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
// number of characters recorded from the last vgetc() call
|
// number of characters recorded from the last vgetc() call
|
||||||
static int last_vgetc_recorded_len = 0;
|
static size_t last_vgetc_recorded_len = 0;
|
||||||
|
|
||||||
mod_mask = 0;
|
mod_mask = 0;
|
||||||
vgetc_mod_mask = 0;
|
vgetc_mod_mask = 0;
|
||||||
|
@@ -1593,12 +1593,12 @@ op_insert(oparg_T *oap, long count1)
|
|||||||
|
|
||||||
if (oap->block_mode)
|
if (oap->block_mode)
|
||||||
{
|
{
|
||||||
long ins_len;
|
size_t ins_len;
|
||||||
char_u *firstline, *ins_text;
|
char_u *firstline, *ins_text;
|
||||||
struct block_def bd2;
|
struct block_def bd2;
|
||||||
int did_indent = FALSE;
|
int did_indent = FALSE;
|
||||||
size_t len;
|
size_t len;
|
||||||
int add;
|
size_t add;
|
||||||
// offset when cursor was moved in insert mode
|
// offset when cursor was moved in insert mode
|
||||||
int offset = 0;
|
int offset = 0;
|
||||||
|
|
||||||
@@ -1703,7 +1703,7 @@ op_insert(oparg_T *oap, long count1)
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if ((size_t)add > len)
|
if (add > len)
|
||||||
add = len; // short line, point to the NUL
|
add = len; // short line, point to the NUL
|
||||||
firstline += add;
|
firstline += add;
|
||||||
len -= add;
|
len -= add;
|
||||||
|
@@ -704,6 +704,8 @@ static char *(features[]) =
|
|||||||
|
|
||||||
static int included_patches[] =
|
static int included_patches[] =
|
||||||
{ /* Add new patch number below this line */
|
{ /* Add new patch number below this line */
|
||||||
|
/**/
|
||||||
|
274,
|
||||||
/**/
|
/**/
|
||||||
273,
|
273,
|
||||||
/**/
|
/**/
|
||||||
|
Reference in New Issue
Block a user