Mercurial > vim
changeset 13316:de19318319a6 v8.0.1532
patch 8.0.1532: compiler warnings without termguicolors feature
commit https://github.com/vim/vim/commit/cc0f2be88046bd1c07efa444bba6c05efe15ddd5
Author: Bram Moolenaar <Bram@vim.org>
Date: Fri Feb 23 18:23:30 2018 +0100
patch 8.0.1532: compiler warnings without termguicolors feature
Problem: Compiler warnings without termguicolors feature.
Solution: Add #ifdef. (John Marriott) Cleanup the code a bit.
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Fri, 23 Feb 2018 18:30:07 +0100 |
| parents | 1e7852d6d333 |
| children | 64be34986f54 |
| files | src/term.c src/version.c |
| diffstat | 2 files changed, 30 insertions(+), 27 deletions(-) [+] |
line wrap: on
line diff
--- a/src/term.c +++ b/src/term.c @@ -6624,9 +6624,10 @@ update_tcap(int attr) } } +# ifdef FEAT_TERMGUICOLORS struct ks_tbl_s { - int code; /* value of KS_ */ + int code; /* value of KS_ */ char *vtp; /* code in vtp mode */ char *buf; /* buffer in non-vtp mode */ char *vbuf; /* buffer in vtp mode */ @@ -6649,19 +6650,16 @@ static struct ks_tbl_s ks_tbl[] = static struct builtin_term * find_first_tcap( char_u *name, - int code) + int code) { struct builtin_term *p; - p = find_builtin_term(name); - while (p->bt_string != NULL) - { + for (p = find_builtin_term(name); p->bt_string != NULL; ++p) if (p->bt_entry == code) return p; - p++; - } return NULL; } +# endif /* * For Win32 console: replace the sequence immediately after termguicolors. @@ -6670,23 +6668,24 @@ find_first_tcap( swap_tcap(void) { # ifdef FEAT_TERMGUICOLORS - static int init = 0; - static int last_tgc; - struct ks_tbl_s *ks; + static int init_done = FALSE; + static int last_tgc; + struct ks_tbl_s *ks; struct builtin_term *bt; /* buffer initialization */ - if (init == 0) + if (!init_done) { - ks = ks_tbl; - while (ks->vtp != NULL) + for (ks = ks_tbl; ks->vtp != NULL; ks++) { bt = find_first_tcap(DEFAULT_TERM, ks->code); - ks->buf = bt->bt_string; - ks->vbuf = ks->vtp; - ks++; + if (bt != NULL) + { + ks->buf = bt->bt_string; + ks->vbuf = ks->vtp; + } } - init++; + init_done = TRUE; last_tgc = p_tgc; return; } @@ -6696,25 +6695,27 @@ swap_tcap(void) if (p_tgc) { /* switch to special character sequence */ - ks = ks_tbl; - while (ks->vtp != NULL) + for (ks = ks_tbl; ks->vtp != NULL; ks++) { bt = find_first_tcap(DEFAULT_TERM, ks->code); - ks->buf = bt->bt_string; - bt->bt_string = ks->vbuf; - ks++; + if (bt != NULL) + { + ks->buf = bt->bt_string; + bt->bt_string = ks->vbuf; + } } } else { /* switch to index color */ - ks = ks_tbl; - while (ks->vtp != NULL) + for (ks = ks_tbl; ks->vtp != NULL; ks++) { bt = find_first_tcap(DEFAULT_TERM, ks->code); - ks->vbuf = bt->bt_string; - bt->bt_string = ks->buf; - ks++; + if (bt != NULL) + { + ks->vbuf = bt->bt_string; + bt->bt_string = ks->buf; + } } }