mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-30 23:18:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed lint errors

Browse Source
This commit is contained in:
MichaHoffmann
2018-09-24 22:05:01 +02:00
parent 50c22325df
commit 8cb04c2230
7 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/nvim/eval.c
View File

@@ -11917,7 +11917,7 @@ static void f_json_decode(typval_T *argvars, typval_T *rettv, FunPtr fptr)
} }
} }
if (json_decode_string(s, len, rettv) == FAIL) { if (json_decode_string(s, len, rettv) == FAIL) {
EMSG3(_("E474: Failed to parse %.*s"), (int) len, s); EMSG3(_("E474: Failed to parse %.*s"), (int)len, s);
rettv->v_type = VAR_NUMBER; rettv->v_type = VAR_NUMBER;
rettv->vval.v_number = 0; rettv->vval.v_number = 0;
} }

2
src/nvim/log.c
View File

@@ -239,7 +239,7 @@ end:
static bool do_log_to_file(FILE *log_file, int log_level, const char *context, static bool do_log_to_file(FILE *log_file, int log_level, const char *context,
const char *func_name, int line_num, bool eol, const char *func_name, int line_num, bool eol,
const char* fmt, ...) const char *fmt, ...)
FUNC_ATTR_PRINTF(7, 8) FUNC_ATTR_PRINTF(7, 8)
{ {
va_list args; va_list args;

2
src/nvim/shada.c
View File

@@ -2091,7 +2091,7 @@ static const char *shada_format_entry(const ShadaEntry entry)
entry.data.filemark.mark.lnum, \ entry.data.filemark.mark.lnum, \
entry.data.filemark.mark.col, \ entry.data.filemark.mark.col, \
entry.data.filemark.mark.coladd, \ entry.data.filemark.mark.coladd, \
(void*)entry.data.filemark.additional_data, \ (void *)entry.data.filemark.additional_data, \
ad_len, \ ad_len, \
ad); \ ad); \
} while (0) } while (0)

10
src/nvim/spellfile.c
View File

@@ -3583,13 +3583,13 @@ static int spell_read_wordfile(spellinfo_T *spin, char_u *fname)
if (*line == '/') { if (*line == '/') {
++line; ++line;
if (STRNCMP(line, "encoding=", 9) == 0) { if (STRNCMP(line, "encoding=", 9) == 0) {
if (spin->si_conv.vc_type != CONV_NONE) if (spin->si_conv.vc_type != CONV_NONE) {
smsg(_("Duplicate /encoding= line ignored in %s line %ld: %s"), smsg(_("Duplicate /encoding= line ignored in %s line %ld: %s"),
fname, lnum, line - 1); fname, lnum, line - 1);
else if (did_word) } else if (did_word) {
smsg(_("/encoding= line after word ignored in %s line %ld: %s"), smsg(_("/encoding= line after word ignored in %s line %ld: %s"),
fname, lnum, line - 1); fname, lnum, line - 1);
else { } else {
char_u *enc; char_u *enc;
// Setup for conversion to 'encoding'. // Setup for conversion to 'encoding'.
@@ -3607,10 +3607,10 @@ static int spell_read_wordfile(spellinfo_T *spin, char_u *fname)
} }
if (STRNCMP(line, "regions=", 8) == 0) { if (STRNCMP(line, "regions=", 8) == 0) {
if (spin->si_region_count > 1) if (spin->si_region_count > 1) {
smsg(_("Duplicate /regions= line ignored in %s line %ld: %s"), smsg(_("Duplicate /regions= line ignored in %s line %ld: %s"),
fname, lnum, line); fname, lnum, line);
else { } else {
line += 8; line += 8;
if (STRLEN(line) > MAXREGIONS * 2) { if (STRLEN(line) > MAXREGIONS * 2) {
smsg(_("Too many regions in %s line %ld: %s"), smsg(_("Too many regions in %s line %ld: %s"),