Mercurial > vim
diff src/term.c @ 8975:9c097bfad637 v7.4.1773
commit https://github.com/vim/vim/commit/380130f1e18da92a44372728fe044f56db58585b
Author: Bram Moolenaar <Bram@vim.org>
Date: Fri Apr 22 11:24:43 2016 +0200
patch 7.4.1773
Problem: Compiler warnings. (Dominique Pelle)
Solution: Add UNUSED. Add type cast. Avoid a buffer overflow.
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Fri, 22 Apr 2016 11:30:07 +0200 |
| parents | c83e2c1e7f2b |
| children | b3da1ec8d156 |
line wrap: on
line diff
--- a/src/term.c +++ b/src/term.c @@ -1272,6 +1272,7 @@ struct rgbcolor_table_S { char_u *color_name; guicolor_T color; }; + static struct rgbcolor_table_S rgb_table[] = { {(char_u *)"black", RGB(0x00, 0x00, 0x00)}, {(char_u *)"blue", RGB(0x00, 0x00, 0xD4)}, @@ -1354,7 +1355,7 @@ termtrue_mch_get_color(char_u *name) else { /* Check if the name is one of the colors we know */ - for (i = 0; i < sizeof(rgb_table) / sizeof(rgb_table[0]); i++) + for (i = 0; i < (int)(sizeof(rgb_table) / sizeof(rgb_table[0])); i++) if (STRICMP(name, rgb_table[i].color_name) == 0) return rgb_table[i].color; } @@ -1384,7 +1385,7 @@ termtrue_mch_get_color(char_u *name) int pos; char *color; - fgets(line, LINE_LEN, fd); + ignored = fgets(line, LINE_LEN, fd); len = strlen(line); if (len <= 1 || line[len-1] != '\n') @@ -2803,9 +2804,11 @@ term_bg_rgb_color(long_u rgb) static void term_rgb_color(char_u *s, long_u rgb) { - char buf[7+3*3+2+1+1]; - - sprintf(buf, (char *)s, RED(rgb), GREEN(rgb), BLUE(rgb)); +#define MAX_COLOR_STR_LEN 100 + char buf[MAX_COLOR_STR_LEN]; + + vim_snprintf(buf, MAX_KEY_CODE_LEN, + (char *)s, RED(rgb), GREEN(rgb), BLUE(rgb)); OUT_STR(buf); } #endif