kevin/neovim
1
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-12-20 19:25:11 -07:00
Code Issues Packages Projects Releases Wiki Activity

Enable -Wconversion for version.c #1923

Browse Source
This commit is contained in:
Lucas Hermann Negri 2015-02-01 15:31:58 -02:00 committed by Justin M. Keyes
parent f90c9b9105
commit 7751cd21f5
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/nvim/CMakeLists.txt
View File

@ -82,7 +82,6 @@ set(CONV_SOURCES
syntax.c syntax.c
tag.c tag.c
ui.c ui.c
version.c
window.c) window.c)
foreach(sfile ${CONV_SOURCES}) foreach(sfile ${CONV_SOURCES})

21
src/nvim/version.c
View File

@ -4,6 +4,8 @@
/// Vim originated from Stevie version 3.6 (Fish disk 217) by GRWalter (Fred). /// Vim originated from Stevie version 3.6 (Fish disk 217) by GRWalter (Fred).
#include <inttypes.h> #include <inttypes.h>
#include <assert.h>
#include <limits.h>
#include "nvim/vim.h" #include "nvim/vim.h"
#include "nvim/ascii.h" #include "nvim/ascii.h"
@ -1008,8 +1010,8 @@ void maybe_intro_message(void)
void intro_message(int colon) void intro_message(int colon)
{ {
int i; int i;
int row; long row;
int blanklines; long blanklines;
int sponsor; int sponsor;
char *p; char *p;
static char *(lines[]) = { static char *(lines[]) = {
@ -1027,7 +1029,10 @@ void intro_message(int colon)
}; };
// blanklines = screen height - # message lines // blanklines = screen height - # message lines
blanklines = (int)Rows - (ARRAY_SIZE(lines) - 1); size_t lines_size = ARRAY_SIZE(lines);
assert(lines_size <= LONG_MAX);
blanklines = Rows - ((long)lines_size - 1l);
// Don't overwrite a statusline. Depends on 'cmdheight'. // Don't overwrite a statusline. Depends on 'cmdheight'.
if (p_ls > 1) { if (p_ls > 1) {
@ -1073,13 +1078,14 @@ void intro_message(int colon)
// Make the wait-return message appear just below the text. // Make the wait-return message appear just below the text.
if (colon) { if (colon) {
msg_row = row; assert(row <= INT_MAX);
msg_row = (int)row;
} }
} }
static void do_intro_line(int row, char_u *mesg, int attr) static void do_intro_line(long row, char_u *mesg, int attr)
{ {
int col; long col;
char_u *p; char_u *p;
int l; int l;
int clen; int clen;
@ -1106,7 +1112,8 @@ static void do_intro_line(int row, char_u *mesg, int attr)
clen += byte2cells(p[l]); clen += byte2cells(p[l]);
} }
} }
screen_puts_len(p, l, row, col, *p == '<' ? hl_attr(HLF_8) : attr); assert(row <= INT_MAX && col <= INT_MAX);
screen_puts_len(p, l, (int)row, (int)col, *p == '<' ? hl_attr(HLF_8) : attr);
col += clen; col += clen;
} }
} }