diff options
| author | Michael Reed <m.reed@mykolab.com> | 2015-05-13 15:29:50 -0400 |
|---|---|---|
| committer | Michael Reed <m.reed@mykolab.com> | 2015-05-13 15:29:50 -0400 |
| commit | af3381b3196107653c04b56e7fae07e8a9a320ed (patch) | |
| tree | f7dfab3c160479dd7170fbdb47684c6fd9188f4e | |
| parent | 62bcd98ae3ad74265ded36e3e6e57209148a1ece (diff) | |
| download | rneovim-af3381b3196107653c04b56e7fae07e8a9a320ed.tar.gz rneovim-af3381b3196107653c04b56e7fae07e8a9a320ed.tar.bz2 rneovim-af3381b3196107653c04b56e7fae07e8a9a320ed.zip | |
Remove char_u: Review
Helped-by: Scott Prager <splinterofchaos@gmail.com>
| -rw-r--r-- | src/nvim/ex_eval.c | 3 | ||||
| -rw-r--r-- | src/nvim/main.c | 9 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/nvim/ex_eval.c b/src/nvim/ex_eval.c index 5c2751fa00..bea1aecb58 100644 --- a/src/nvim/ex_eval.c +++ b/src/nvim/ex_eval.c @@ -702,8 +702,7 @@ static void report_pending(int action, int pending, void *value) if (pending & CSTP_THROW) { vim_snprintf((char *)IObuff, IOSIZE, mesg, _("Exception")); - mesg = (char *)vim_strnsave(IObuff, STRLEN(IObuff) + 4); - strcat(mesg, ": %s"); + mesg = (char *)concat_str(IObuff, (char_u *)": %s"); s = (char *)((except_T *)value)->value; } else if ((pending & CSTP_ERROR) && (pending & CSTP_INTERRUPT)) s = _("Error and interrupt"); diff --git a/src/nvim/main.c b/src/nvim/main.c index da527eda7c..3120caa782 100644 --- a/src/nvim/main.c +++ b/src/nvim/main.c @@ -1168,12 +1168,13 @@ static void command_line_scan(mparm_T *parmp) a = SESSION_FILE; ++argc; --argv; - } else + } else { a = argv[0]; - p = xmalloc(STRLEN(a) + 4); - sprintf((char *)p, "so %s", a); + } + char *s = xmalloc(STRLEN(a) + 4); + sprintf(s, "so %s", a); parmp->cmds_tofree[parmp->n_commands] = TRUE; - parmp->commands[parmp->n_commands++] = (char *)p; + parmp->commands[parmp->n_commands++] = s; } else { parmp->commands[parmp->n_commands++] = argv[0]; } |