IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

Remove OOM checks: alloc_typebuf()

Browse Source
This commit is contained in:
Felipe Oliveira Carvalho 2014-05-10 01:09:33 -03:00
parent 27f5f7b1e8
commit 39a272c4db
3 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/nvim/ex_docmd.c
View File

@ -7380,6 +7380,7 @@ static void ex_normal(exarg_T *eap)
* ends with half a command. * ends with half a command.
*/ */
save_typeahead(&tabuf); save_typeahead(&tabuf);
// TODO(philix): after save_typeahead() this is always TRUE
if (tabuf.typebuf_valid) { if (tabuf.typebuf_valid) {
/* /*
* Repeat the :normal command for each line in the range. When no * Repeat the :normal command for each line in the range. When no

15
src/nvim/getchar.c
View File

@ -1142,7 +1142,7 @@ static void may_sync_undo(void)
/* /*
* Make "typebuf" empty and allocate new buffers. * Make "typebuf" empty and allocate new buffers.
*/ */
int alloc_typebuf(void) void alloc_typebuf(void)
{ {
typebuf.tb_buf = xmalloc(TYPELEN_INIT); typebuf.tb_buf = xmalloc(TYPELEN_INIT);
typebuf.tb_noremap = xmalloc(TYPELEN_INIT); typebuf.tb_noremap = xmalloc(TYPELEN_INIT);
@ -1154,7 +1154,6 @@ int alloc_typebuf(void)
typebuf.tb_no_abbr_cnt = 0; typebuf.tb_no_abbr_cnt = 0;
if (++typebuf.tb_change_cnt == 0) if (++typebuf.tb_change_cnt == 0)
typebuf.tb_change_cnt = 1; typebuf.tb_change_cnt = 1;
return OK;
} }
/* /*
@ -1182,11 +1181,7 @@ int save_typebuf(void)
{ {
init_typebuf(); init_typebuf();
saved_typebuf[curscript] = typebuf; saved_typebuf[curscript] = typebuf;
/* If out of memory: restore typebuf and close file. */ alloc_typebuf();
if (alloc_typebuf() == FAIL) {
closescript();
return FAIL;
}
return OK; return OK;
} }
@ -1202,10 +1197,8 @@ static int old_mouse_col; /* mouse_col related to old_char */
void save_typeahead(tasave_T *tp) void save_typeahead(tasave_T *tp)
{ {
tp->save_typebuf = typebuf; tp->save_typebuf = typebuf;
tp->typebuf_valid = (alloc_typebuf() == OK); alloc_typebuf();
if (!tp->typebuf_valid) tp->typebuf_valid = TRUE;
typebuf = tp->save_typebuf;
tp->old_char = old_char; tp->old_char = old_char;
tp->old_mod_mask = old_mod_mask; tp->old_mod_mask = old_mod_mask;
old_char = -1; old_char = -1;

2
src/nvim/getchar.h
View File

@ -31,7 +31,7 @@ int typebuf_changed(int tb_change_cnt);
int typebuf_typed(void); int typebuf_typed(void);
int typebuf_maplen(void); int typebuf_maplen(void);
void del_typebuf(int len, int offset); void del_typebuf(int len, int offset);
int alloc_typebuf(void); void alloc_typebuf(void);
void free_typebuf(void); void free_typebuf(void);
int save_typebuf(void); int save_typebuf(void);
void save_typeahead(tasave_T *tp); void save_typeahead(tasave_T *tp);