aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-15 23:23:38 -04:00
Code

patch 9.1.0163: Calling STRLEN() to compute ml_line_textlen when not needed

Browse Source 
Problem:  Calling STRLEN() to compute ml_line_textlen when not needed.
Solution: Use 0 when STRLEN() will be required and call STRLEN() later.
          (zeertzjq)

closes: #14155

Signed-off-by: zeertzjq <zeertzjq@outlook.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
zeertzjq 2024-03-10 08:55:42 +01:00 committed by Christian Brabandt
parent 14759ded57
commit 82e079df81
No known key found for this signature in database
GPG Key ID: F3F92DA383FDDE09
5 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/change.c
View File

@ -1364,7 +1364,7 @@ del_bytes(
mch_memmove(newp + newlen + 1, oldp + oldlen + 1,
(size_t)curbuf->b_ml.ml_line_len - oldlen - 1);
curbuf->b_ml.ml_line_len -= count;
curbuf->b_ml.ml_line_textlen = (int)STRLEN(newp) + 1;
curbuf->b_ml.ml_line_textlen = 0;
}
#endif

2
src/edit.c
View File

@ -5088,7 +5088,7 @@ ins_tab(void)
vim_free(curbuf->b_ml.ml_line_ptr);
curbuf->b_ml.ml_line_ptr = newp;
curbuf->b_ml.ml_line_len -= i;
curbuf->b_ml.ml_line_textlen = (int)STRLEN(newp) + 1;
curbuf->b_ml.ml_line_textlen = 0;
curbuf->b_ml.ml_flags =
(curbuf->b_ml.ml_flags | ML_LINE_DIRTY) & ~ML_EMPTY;
}

13
src/memline.c
View File

@ -2700,9 +2700,13 @@ ml_get_cursor_len(void)
colnr_T
ml_get_buf_len(buf_T *buf, linenr_T lnum)
{
if (*ml_get_buf(buf, lnum, FALSE) == NUL)
char_u *line;
if (*(line = ml_get_buf(buf, lnum, FALSE)) == NUL)
return 0;
if (buf->b_ml.ml_line_textlen <= 0)
buf->b_ml.ml_line_textlen = (int)STRLEN(line) + 1;
return buf->b_ml.ml_line_textlen - 1;
}
@ -2799,8 +2803,11 @@ errorret:
buf->b_ml.ml_line_ptr = (char_u *)dp + start;
buf->b_ml.ml_line_len = end - start;
#if defined(FEAT_BYTEOFF) && defined(FEAT_PROP_POPUP)
if (buf->b_has_textprop)
buf->b_ml.ml_line_textlen = (int)STRLEN(buf->b_ml.ml_line_ptr) + 1;
// Text properties come after a NUL byte, so ml_line_len should be
// larger than the size of textprop_T if there is any.
if (buf->b_has_textprop
&& (size_t)buf->b_ml.ml_line_len > sizeof(textprop_T))
buf->b_ml.ml_line_textlen = 0; // call STRLEN() later when needed
else
#endif
buf->b_ml.ml_line_textlen = buf->b_ml.ml_line_len;

4
src/structs.h
View File

@ -802,8 +802,8 @@ typedef struct memline
#define ML_ALLOCATED 0x10 // ml_line_ptr is an allocated copy
int ml_flags;
colnr_T ml_line_len; // length of the cached line + textproperties, including NUL
colnr_T ml_line_textlen;// length of the cached line, including NUL
colnr_T ml_line_len; // length of the cached line + NUL + text properties
colnr_T ml_line_textlen;// length of the cached line + NUL, 0 if not known yet
linenr_T ml_line_lnum; // line number of cached line, 0 if not valid
char_u *ml_line_ptr; // pointer to cached line

2
src/version.c
View File

@ -704,6 +704,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
163,
/**/
162,
/**/