aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-10-17 07:44:28 -04:00
Code Activity

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
5 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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;