patch 9.1.0113: duplicate code when cleaning undo stack
Problem: duplicate code when cleaning undo stack Solution: refactor undo cleanup into a single public function related: #13928 Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
38
src/undo.c
38
src/undo.c
@ -123,6 +123,7 @@ static void serialize_visualinfo(bufinfo_T *bi, visualinfo_T *info);
|
||||
static void unserialize_visualinfo(bufinfo_T *bi, visualinfo_T *info);
|
||||
#endif
|
||||
static void u_saveline(linenr_T lnum);
|
||||
static void u_blockfree(buf_T *buf);
|
||||
|
||||
#define U_ALLOC_LINE(size) lalloc(size, FALSE)
|
||||
|
||||
@ -3472,7 +3473,7 @@ u_freeentry(u_entry_T *uep, long n)
|
||||
/*
|
||||
* invalidate the undo buffer; called when storage has already been released
|
||||
*/
|
||||
void
|
||||
static void
|
||||
u_clearall(buf_T *buf)
|
||||
{
|
||||
buf->b_u_newhead = buf->b_u_oldhead = buf->b_u_curhead = NULL;
|
||||
@ -3483,6 +3484,30 @@ u_clearall(buf_T *buf)
|
||||
buf->b_u_line_lnum = 0;
|
||||
}
|
||||
|
||||
/*
|
||||
* Free all allocated memory blocks for the buffer 'buf'.
|
||||
*/
|
||||
static void
|
||||
u_blockfree(buf_T *buf)
|
||||
{
|
||||
while (buf->b_u_oldhead != NULL)
|
||||
u_freeheader(buf, buf->b_u_oldhead, NULL);
|
||||
vim_free(buf->b_u_line_ptr.ul_line);
|
||||
}
|
||||
|
||||
/*
|
||||
* Free all allocated memory blocks for the buffer 'buf'.
|
||||
* and invalidate the undo buffer
|
||||
*/
|
||||
void
|
||||
u_clearallandblockfree(buf_T *buf)
|
||||
{
|
||||
u_blockfree(buf);
|
||||
u_clearall(buf);
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*
|
||||
* Save the line "lnum" for the "U" command.
|
||||
*/
|
||||
@ -3562,17 +3587,6 @@ u_undoline(void)
|
||||
check_cursor_col();
|
||||
}
|
||||
|
||||
/*
|
||||
* Free all allocated memory blocks for the buffer 'buf'.
|
||||
*/
|
||||
void
|
||||
u_blockfree(buf_T *buf)
|
||||
{
|
||||
while (buf->b_u_oldhead != NULL)
|
||||
u_freeheader(buf, buf->b_u_oldhead, NULL);
|
||||
vim_free(buf->b_u_line_ptr.ul_line);
|
||||
}
|
||||
|
||||
/*
|
||||
* Check if the 'modified' flag is set, or 'ff' has changed (only need to
|
||||
* check the first character, because it can only be "dos", "unix" or "mac").
|
||||
|
||||
Reference in New Issue
Block a user