diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2014-11-28 18:13:28 +0000 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2014-11-28 18:19:38 +0000 |
| commit | 3ef8e4f33ea81c81b9d6a3f093765d5e161238b0 (patch) | |
| tree | 88284a3826a6fe027f4036e49a3ea0312272ea26 /src/nvim/ex_eval.c | |
| parent | 3e665efea47911bcbe94485dd35efa4c3062c662 (diff) | |
| download | rneovim-3ef8e4f33ea81c81b9d6a3f093765d5e161238b0.tar.gz rneovim-3ef8e4f33ea81c81b9d6a3f093765d5e161238b0.tar.bz2 rneovim-3ef8e4f33ea81c81b9d6a3f093765d5e161238b0.zip | |
Wconversion: fix #1578
Diffstat (limited to 'src/nvim/ex_eval.c')
| -rw-r--r-- | src/nvim/ex_eval.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/nvim/ex_eval.c b/src/nvim/ex_eval.c index ef3facb18b..196f8e6136 100644 --- a/src/nvim/ex_eval.c +++ b/src/nvim/ex_eval.c @@ -386,21 +386,19 @@ int do_intthrow(struct condstack *cstack) char_u *get_exception_string(void *value, int type, char_u *cmdname, int *should_free) { char_u *ret, *mesg; - int cmdlen; char_u *p, *val; if (type == ET_ERROR) { *should_free = FALSE; mesg = ((struct msglist *)value)->throw_msg; if (cmdname != NULL && *cmdname != NUL) { - cmdlen = (int)STRLEN(cmdname); - ret = vim_strnsave((char_u *)"Vim(", - 4 + cmdlen + 2 + (int)STRLEN(mesg)); + size_t cmdlen = STRLEN(cmdname); + ret = vim_strnsave((char_u *)"Vim(", 4 + cmdlen + 2 + STRLEN(mesg)); STRCPY(&ret[4], cmdname); STRCPY(&ret[4 + cmdlen], "):"); val = ret + 4 + cmdlen + 2; } else { - ret = vim_strnsave((char_u *)"Vim:", 4 + (int)STRLEN(mesg)); + ret = vim_strnsave((char_u *)"Vim:", 4 + STRLEN(mesg)); val = ret + 4; } @@ -708,7 +706,7 @@ static void report_pending(int action, int pending, void *value) if (pending & CSTP_THROW) { vim_snprintf((char *)IObuff, IOSIZE, (char *)mesg, _("Exception")); - mesg = vim_strnsave(IObuff, (int)STRLEN(IObuff) + 4); + mesg = vim_strnsave(IObuff, STRLEN(IObuff) + 4); STRCAT(mesg, ": %s"); s = (char *)((except_T *)value)->value; } else if ((pending & CSTP_ERROR) && (pending & CSTP_INTERRUPT)) |