Mercurial > vim
changeset 15420:9171193ae720 v8.1.0718
patch 8.1.0718: a couple compiler warnings
commit https://github.com/vim/vim/commit/402385a7f2fed23acef7ad3ce75252706b1d7606
Author: Bram Moolenaar <Bram@vim.org>
Date: Fri Jan 11 14:10:03 2019 +0100
patch 8.1.0718: a couple compiler warnings
Problem: A couple compiler warnings.
Solution: Rename shadowed variables. Add UNUSED.
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Fri, 11 Jan 2019 14:15:05 +0100 |
parents | 74088e9d6b52 |
children | 9402f350ff35 |
files | src/misc1.c src/version.c |
diffstat | 2 files changed, 9 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/misc1.c +++ b/src/misc1.c @@ -2402,7 +2402,7 @@ ins_char_bytes(char_u *buf, int charlen) colnr_T vcol; int old_list; #ifndef FEAT_MBYTE - char_u buf[2]; + char_u cbuf[2]; #endif /* @@ -2422,10 +2422,12 @@ ins_char_bytes(char_u *buf, int charlen) */ getvcol(curwin, &curwin->w_cursor, NULL, &vcol, NULL); #ifndef FEAT_MBYTE - buf[0] = c; - buf[1] = NUL; -#endif + cbuf[0] = c; + cbuf[1] = NUL; + new_vcol = vcol + chartabsize(cbuf, vcol); +#else new_vcol = vcol + chartabsize(buf, vcol); +#endif while (oldp[col + oldlen] != NUL && vcol < new_vcol) { vcol += chartabsize(oldp + col + oldlen, vcol); @@ -3025,7 +3027,7 @@ changed_bytes(linenr_T lnum, colnr_T col * When "added" is negative text was deleted. */ void -inserted_bytes(linenr_T lnum, colnr_T col, int added) +inserted_bytes(linenr_T lnum, colnr_T col, int added UNUSED) { changed_bytes(lnum, col);