diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2018-04-17 10:33:36 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-17 10:33:36 +0200 |
| commit | 7a13611ba2033766da8cad73f46362bd01632c2c (patch) | |
| tree | 170eff47d8e67ad5e2c484697f4bd999abf9844e /src/nvim/message.c | |
| parent | 48967695c441d13bc9faa8aae4bed8d6fb5bdc14 (diff) | |
| parent | 387fbcd95cade4b0c037d18f404944676a59db09 (diff) | |
| download | rneovim-7a13611ba2033766da8cad73f46362bd01632c2c.tar.gz rneovim-7a13611ba2033766da8cad73f46362bd01632c2c.tar.bz2 rneovim-7a13611ba2033766da8cad73f46362bd01632c2c.zip | |
Merge #8276 'startup: Make -s - read from stdin'
Diffstat (limited to 'src/nvim/message.c')
| -rw-r--r-- | src/nvim/message.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/nvim/message.c b/src/nvim/message.c index 04528629c7..3a3c9cb167 100644 --- a/src/nvim/message.c +++ b/src/nvim/message.c @@ -2351,10 +2351,9 @@ static int do_more_prompt(int typed_char) * yet. When stderr can't be used, collect error messages until the GUI has * started and they can be displayed in a message box. */ -void mch_errmsg(char *str) +void mch_errmsg(const char *const str) + FUNC_ATTR_NONNULL_ALL { - int len; - #ifdef UNIX /* On Unix use stderr if it's a tty. * When not going to start the GUI also use stderr. @@ -2368,14 +2367,13 @@ void mch_errmsg(char *str) /* avoid a delay for a message that isn't there */ emsg_on_display = FALSE; - len = (int)STRLEN(str) + 1; + const size_t len = strlen(str) + 1; if (error_ga.ga_data == NULL) { ga_set_growsize(&error_ga, 80); error_ga.ga_itemsize = 1; } ga_grow(&error_ga, len); - memmove((char_u *)error_ga.ga_data + error_ga.ga_len, - (char_u *)str, len); + memmove(error_ga.ga_data + error_ga.ga_len, str, len); #ifdef UNIX /* remove CR characters, they are displayed */ { |