IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

buffer.c: enable -Wconversion #3744

Browse Source 
Closes #3744
This commit is contained in:
Adam-K-P 2015-11-24 17:23:38 -08:00 committed by Justin M. Keyes
parent b62f837395
commit 165d525abd
2 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/nvim/CMakeLists.txt
View File

@ -90,7 +90,6 @@ list(REMOVE_ITEM NEOVIM_SOURCES ${to_remove})
# Legacy files that do not yet pass -Wconversion. # Legacy files that do not yet pass -Wconversion.
set(CONV_SOURCES set(CONV_SOURCES
buffer.c
diff.c diff.c
edit.c edit.c
eval.c eval.c

34
src/nvim/buffer.c
View File

@ -1380,7 +1380,9 @@ void enter_buffer(buf_T *buf)
curwin->w_valid = 0; curwin->w_valid = 0;
if (buf->terminal) { if (buf->terminal) {
terminal_resize(buf->terminal, curwin->w_width, curwin->w_height); terminal_resize(buf->terminal,
(uint16_t)curwin->w_width,
(uint16_t)curwin->w_height);
} }
/* Make sure the buffer is loaded. */ /* Make sure the buffer is loaded. */
@ -2079,7 +2081,7 @@ int ExpandBufnames(char_u *pat, int *num_file, char_u ***file, int options)
if (count == 0) /* no match found, break here */ if (count == 0) /* no match found, break here */
break; break;
if (round == 1) { if (round == 1) {
*file = xmalloc(count * sizeof(**file)); *file = xmalloc((size_t)count * sizeof(**file));
} }
} }
vim_regfree(regmatch.regprog); vim_regfree(regmatch.regprog);
@ -2822,9 +2824,10 @@ void maketitle(void)
if (p_title) { if (p_title) {
if (p_titlelen > 0) { if (p_titlelen > 0) {
maxlen = p_titlelen * Columns / 100; maxlen = (int)(p_titlelen * Columns / 100);
if (maxlen < 10) if (maxlen < 10) {
maxlen = 10; maxlen = 10;
}
} }
t_str = buf; t_str = buf;
@ -3041,7 +3044,7 @@ int build_stl_str_hl(
size_t outlen, size_t outlen,
char_u *fmt, char_u *fmt,
int use_sandbox, int use_sandbox,
int fillchar, char_u fillchar,
int maxwidth, int maxwidth,
struct stl_hlrec *hltab, struct stl_hlrec *hltab,
StlClickRecord *tabtab StlClickRecord *tabtab
@ -3643,7 +3646,7 @@ int build_stl_str_hl(
wp->w_buffer->b_p_ft); wp->w_buffer->b_p_ft);
// Uppercase the file extension // Uppercase the file extension
for (char_u *t = tmp; *t != 0; t++) { for (char_u *t = tmp; *t != 0; t++) {
*t = TOUPPER_LOC(*t); *t = (char_u)TOUPPER_LOC(*t);
} }
str = tmp; str = tmp;
} }
@ -3820,7 +3823,8 @@ int build_stl_str_hl(
} }
// } // }
size_t remaining_buf_len = (out_end_p - out_p) + 1; assert(out_end_p >= out_p);
size_t remaining_buf_len = (size_t)(out_end_p - out_p) + 1;
// If the number is going to take up too much room // If the number is going to take up too much room
// Figure out the approximate number in "scientific" type notation. // Figure out the approximate number in "scientific" type notation.
@ -4011,7 +4015,7 @@ int build_stl_str_hl(
// add characters at the separate marker (if there is one) to // add characters at the separate marker (if there is one) to
// fill up the available space. // fill up the available space.
} else if (width < maxwidth } else if (width < maxwidth
&& STRLEN(out) + maxwidth - width + 1 < outlen) { && STRLEN(out) + (size_t)(maxwidth - width) + 1 < outlen) {
// Find how many separators there are, which we will use when // Find how many separators there are, which we will use when
// figuring out how many groups there are. // figuring out how many groups there are.
int num_separators = 0; int num_separators = 0;
@ -4257,7 +4261,7 @@ do_arg_all (
setpcmark(); setpcmark();
opened_len = ARGCOUNT; opened_len = ARGCOUNT;
opened = xcalloc(opened_len, 1); opened = xcalloc((size_t)opened_len, 1);
/* Autocommands may do anything to the argument list. Make sure it's not /* Autocommands may do anything to the argument list. Make sure it's not
* freed while we are working here by "locking" it. We still have to * freed while we are working here by "locking" it. We still have to
@ -4473,8 +4477,8 @@ void ex_buffer_all(exarg_T *eap)
bool p_ea_save; bool p_ea_save;
int open_wins = 0; int open_wins = 0;
int r; int r;
int count; /* Maximum number of windows to open. */ long count; // Maximum number of windows to open.
int all; /* When TRUE also load inactive buffers. */ int all; // When TRUE also load inactive buffers.
int had_tab = cmdmod.tab; int had_tab = cmdmod.tab;
tabpage_T *tpnext; tabpage_T *tpnext;
@ -4998,7 +5002,7 @@ int buf_findsign(
for (sign = buf->b_signlist; sign != NULL; sign = sign->next) { for (sign = buf->b_signlist; sign != NULL; sign = sign->next) {
if (sign->id == id) { if (sign->id == id) {
return sign->lnum; return (int)sign->lnum;
} }
} }
@ -5212,8 +5216,10 @@ void bufhl_clear_line_range(buf_T *buf,
/// @param bufhl_info The highlight info for the buffer /// @param bufhl_info The highlight info for the buffer
/// @param src_id Highlight source group to clear, or -1 to clear all groups. /// @param src_id Highlight source group to clear, or -1 to clear all groups.
/// @param lnum Linenr where the highlight should be cleared /// @param lnum Linenr where the highlight should be cleared
static bool bufhl_clear_line(bufhl_info_T *bufhl_info, int src_id, int lnum) { static bool bufhl_clear_line(bufhl_info_T *bufhl_info, int src_id,
bufhl_vec_T* lineinfo = map_ref(linenr_T, bufhl_vec_T)(bufhl_info, linenr_T lnum)
{
bufhl_vec_T *lineinfo = map_ref(linenr_T, bufhl_vec_T)(bufhl_info,
lnum, false); lnum, false);
size_t oldsize = kv_size(*lineinfo); size_t oldsize = kv_size(*lineinfo);
if (src_id < 0) { if (src_id < 0) {