diff options
| -rw-r--r-- | src/nvim/eval.c | 2 | ||||
| -rw-r--r-- | src/nvim/fileio.c | 2 | ||||
| -rw-r--r-- | src/nvim/log.c | 2 | ||||
| -rw-r--r-- | src/nvim/regexp_nfa.c | 4 | ||||
| -rw-r--r-- | src/nvim/shada.c | 2 | ||||
| -rw-r--r-- | src/nvim/spellfile.c | 14 | ||||
| -rw-r--r-- | src/nvim/undo.c | 2 |
7 files changed, 14 insertions, 14 deletions
diff --git a/src/nvim/eval.c b/src/nvim/eval.c index c10ecd43db..f3be0bc9c6 100644 --- a/src/nvim/eval.c +++ b/src/nvim/eval.c @@ -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) { - EMSG3(_("E474: Failed to parse %.*s"), (int) len, s); + EMSG3(_("E474: Failed to parse %.*s"), (int)len, s); rettv->v_type = VAR_NUMBER; rettv->vval.v_number = 0; } diff --git a/src/nvim/fileio.c b/src/nvim/fileio.c index ab6b992541..f0f76ffa36 100644 --- a/src/nvim/fileio.c +++ b/src/nvim/fileio.c @@ -6217,7 +6217,7 @@ static int do_autocmd_event(event_T event, char_u *pat, int nested, char_u *cmd, if (is_buflocal && (buflocal_nr == 0 || buflist_findnr(buflocal_nr) == NULL)) { EMSG2(_("E680: <buffer=%d>: invalid buffer number "), - buflocal_nr); + buflocal_nr); return FAIL; } diff --git a/src/nvim/log.c b/src/nvim/log.c index 4cafd4573b..503c4b122c 100644 --- a/src/nvim/log.c +++ b/src/nvim/log.c @@ -239,7 +239,7 @@ end: 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* fmt, ...) + const char *fmt, ...) FUNC_ATTR_PRINTF(7, 8) { va_list args; diff --git a/src/nvim/regexp_nfa.c b/src/nvim/regexp_nfa.c index b13fc7f5ea..61ab9ef343 100644 --- a/src/nvim/regexp_nfa.c +++ b/src/nvim/regexp_nfa.c @@ -1385,7 +1385,7 @@ static int nfa_regatom(void) break; default: EMSG2(_("E867: (NFA) Unknown operator '\\z%c'"), - no_Magic(c)); + no_Magic(c)); return FAIL; } break; @@ -1525,7 +1525,7 @@ static int nfa_regatom(void) } } EMSG2(_("E867: (NFA) Unknown operator '\\%%%c'"), - no_Magic(c)); + no_Magic(c)); return FAIL; } break; diff --git a/src/nvim/shada.c b/src/nvim/shada.c index b5fda32ac9..11da7195bf 100644 --- a/src/nvim/shada.c +++ b/src/nvim/shada.c @@ -2091,7 +2091,7 @@ static const char *shada_format_entry(const ShadaEntry entry) entry.data.filemark.mark.lnum, \ entry.data.filemark.mark.col, \ entry.data.filemark.mark.coladd, \ - (void*)entry.data.filemark.additional_data, \ + (void *)entry.data.filemark.additional_data, \ ad_len, \ ad); \ } while (0) diff --git a/src/nvim/spellfile.c b/src/nvim/spellfile.c index 892d2697cc..0fc9aaf3b5 100644 --- a/src/nvim/spellfile.c +++ b/src/nvim/spellfile.c @@ -3096,8 +3096,8 @@ static int spell_read_dic(spellinfo_T *spin, char_u *fname, afffile_T *affile) if (spin->si_verbose && spin->si_msg_count > 10000) { spin->si_msg_count = 0; vim_snprintf((char *)message, sizeof(message), - _("line %6d, word %6ld - %s"), - lnum, spin->si_foldwcount + spin->si_keepwcount, w); + _("line %6d, word %6ld - %s"), + lnum, spin->si_foldwcount + spin->si_keepwcount, w); msg_start(); msg_puts_long_attr(message, 0); msg_clr_eos(); @@ -3583,13 +3583,13 @@ static int spell_read_wordfile(spellinfo_T *spin, char_u *fname) if (*line == '/') { ++line; 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"), fname, lnum, line - 1); - else if (did_word) + } else if (did_word) { smsg(_("/encoding= line after word ignored in %s line %ld: %s"), fname, lnum, line - 1); - else { + } else { char_u *enc; // 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 (spin->si_region_count > 1) + if (spin->si_region_count > 1) { smsg(_("Duplicate /regions= line ignored in %s line %ld: %s"), fname, lnum, line); - else { + } else { line += 8; if (STRLEN(line) > MAXREGIONS * 2) { smsg(_("Too many regions in %s line %ld: %s"), diff --git a/src/nvim/undo.c b/src/nvim/undo.c index 7e9141edda..1e6be5d824 100644 --- a/src/nvim/undo.c +++ b/src/nvim/undo.c @@ -2504,7 +2504,7 @@ void ex_undolist(exarg_T *eap) if (uhp->uh_prev.ptr == NULL && uhp->uh_walk != nomark && uhp->uh_walk != mark) { vim_snprintf((char *)IObuff, IOSIZE, "%6ld %7d ", - uhp->uh_seq, changes); + uhp->uh_seq, changes); u_add_time(IObuff + STRLEN(IObuff), IOSIZE - STRLEN(IObuff), uhp->uh_time); if (uhp->uh_save_nr > 0) { |