mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-18 09:18:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove OOM checks: reverse_text()

Browse Source
This commit is contained in:
Felipe Oliveira Carvalho
2014-05-10 00:33:20 -03:00
parent 21784aeb00
commit e5e3cbf320
2 changed files with 23 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/nvim/popupmnu.c
View File

@@ -346,12 +346,8 @@ void pum_redraw(void)
if (curwin->w_p_rl) { if (curwin->w_p_rl) {
char_u *rt = reverse_text(st); char_u *rt = reverse_text(st);
if (rt != NULL) {
char_u *rt_start = rt; char_u *rt_start = rt;
int size; int size = vim_strsize(rt);
size = vim_strsize(rt);
if (size > pum_width) { if (size > pum_width) {
do { do {
@@ -370,7 +366,6 @@ void pum_redraw(void)
screen_puts_len(rt, (int)STRLEN(rt), row, col - size + 1, screen_puts_len(rt, (int)STRLEN(rt), row, col - size + 1,
attr); attr);
free(rt_start); free(rt_start);
}
free(st); free(st);
col -= width; col -= width;

10
src/nvim/search.c
View File

@@ -230,7 +230,9 @@ char_u *get_search_pat(void)
/* /*
* Reverse text into allocated memory. * Reverse text into allocated memory.
* Returns the allocated string, NULL when out of memory. * Returns the allocated string.
*
* TODO(philix): move reverse_text() to strings.c
*/ */
char_u *reverse_text(char_u *s) char_u *reverse_text(char_u *s)
{ {
@@ -1080,14 +1082,10 @@ proftime_T *tm; /* timeout limit or NULL */
* it would be blanked out again very soon. Show it on the * it would be blanked out again very soon. Show it on the
* left, but do reverse the text. */ * left, but do reverse the text. */
if (curwin->w_p_rl && *curwin->w_p_rlc == 's') { if (curwin->w_p_rl && *curwin->w_p_rlc == 's') {
char_u *r; char_u *r = reverse_text(trunc != NULL ? trunc : msgbuf);
r = reverse_text(trunc != NULL ? trunc : msgbuf);
if (r != NULL) {
free(trunc); free(trunc);
trunc = r; trunc = r;
} }
}
if (trunc != NULL) { if (trunc != NULL) {
msg_outtrans(trunc); msg_outtrans(trunc);
free(trunc); free(trunc);