adam/vim
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

patch 9.1.0997: too many strlen() calls in drawscreen.c

Browse Source 
Problem:  too many strlen() calls in drawscreen.c
Solution: refactor drawscreen.c and remove calls to strlen(),
          make get_keymap_str() (in screen.c) return string length
          instead of TRUE/FALSE (John Marriott).

Signed-off-by: John Marriott <basilisk@internode.on.net>
Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
John Marriott
2025-01-08 20:10:59 +01:00
committed by Christian Brabandt
parent 8ab1819df6
commit a21240b97d
5 changed files with 125 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/screen.c
View File

@ -968,20 +968,21 @@ get_keymap_str(
int len) // length of buffer
{
char_u *p;
int plen;
if (wp->w_buffer->b_p_iminsert != B_IMODE_LMAP)
return FALSE;
return 0;
#ifdef FEAT_EVAL
buf_T *old_curbuf = curbuf;
win_T *old_curwin = curwin;
char_u to_evaluate[] = "b:keymap_name";
char_u *s;
curbuf = wp->w_buffer;
curwin = wp;
STRCPY(buf, "b:keymap_name"); // must be writable
++emsg_skip;
s = p = eval_to_string(buf, FALSE, FALSE);
s = p = eval_to_string(to_evaluate, FALSE, FALSE);
--emsg_skip;
curbuf = old_curbuf;
curwin = old_curwin;
@ -995,12 +996,17 @@ get_keymap_str(
#endif
p = (char_u *)"lang";
}
if (vim_snprintf((char *)buf, len, (char *)fmt, p) > len - 1)
buf[0] = NUL;
plen = vim_snprintf((char *)buf, len, (char *)fmt, p);
#ifdef FEAT_EVAL
vim_free(s);
#endif
return buf[0] != NUL;
if (plen < 0 || plen > len - 1)
{
buf[0] = NUL;
plen = 0;
}
return plen;
}
#if defined(FEAT_STL_OPT) || defined(PROTO)
@ -4133,7 +4139,7 @@ showmode(void)
else
# endif
if (get_keymap_str(curwin, (char_u *)" (%s)",
NameBuff, MAXPATHL))
NameBuff, MAXPATHL) > 0)
msg_puts_attr((char *)NameBuff, attr);
}
#endif