diff options
| author | Felipe Oliveira Carvalho <felipekde@gmail.com> | 2014-05-12 16:19:50 -0300 |
|---|---|---|
| committer | Felipe Oliveira Carvalho <felipekde@gmail.com> | 2014-05-19 14:50:26 -0300 |
| commit | e303a11ebfc352860cce73184ece692ab4d0f01c (patch) | |
| tree | 67a3e4b7a8d6633149f9d22f3f51cd96498aacd4 /src/nvim/ex_getln.c | |
| parent | 7a830d945fb44a850b7cef65971f37a570a36e9e (diff) | |
| download | rneovim-e303a11ebfc352860cce73184ece692ab4d0f01c.tar.gz rneovim-e303a11ebfc352860cce73184ece692ab4d0f01c.tar.bz2 rneovim-e303a11ebfc352860cce73184ece692ab4d0f01c.zip | |
Remove OOM checks: suggested changes in review
- Replace a vim_strsave/free pair with xrealloc
- Use xmallocz() in some places
- Use xrealloc() and forget about the NULL pointer case
- Remove invalid comment
- Remove unnecessary checks
- Replace a complicated xmalloc/STRCPY/free code chunk code with xrealloc()
- Replace a vim_strsave/free code chunk with xrealloc()
Diffstat (limited to 'src/nvim/ex_getln.c')
| -rw-r--r-- | src/nvim/ex_getln.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/nvim/ex_getln.c b/src/nvim/ex_getln.c index b507116ac3..278886cf5e 100644 --- a/src/nvim/ex_getln.c +++ b/src/nvim/ex_getln.c @@ -1986,7 +1986,7 @@ static void alloc_cmdbuff(int len) else len += 20; - ccline.cmdbuff = xmalloc(len); /* caller should check for out-of-memory */ + ccline.cmdbuff = xmalloc(len); ccline.cmdbufflen = len; } @@ -2179,10 +2179,7 @@ void put_on_cmdline(char_u *str, int len, int redraw) if (len < 0) len = (int)STRLEN(str); - /* Check if ccline.cmdbuff needs to be longer */ - if (ccline.cmdlen + len + 1 >= ccline.cmdbufflen) { - realloc_cmdbuff(ccline.cmdlen + len + 1); - } + realloc_cmdbuff(ccline.cmdlen + len + 1); if (!ccline.overstrike) { memmove(ccline.cmdbuff + ccline.cmdpos + len, |