mirror of
https://github.com/vim/vim.git
synced 2026-05-28 00:21:37 +02:00
patch 9.2.0108: byteidx_common() and f_utf16idx() call ptr2len() twice
Problem: byteidx_common() and f_utf16idx() are calling ptr2len() twice
per iteration, instead of reusing the already computed clen.
Solution: Reuse clen for pointer advancement in both functions
(Yasuhiro Matsumoto).
closes: #19573
Signed-off-by: Yasuhiro Matsumoto <mattn.jp@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
committed by
Christian Brabandt
parent
76abd0ccdf
commit
499e93d09a
+4
-2
@@ -1107,8 +1107,10 @@ byteidx_common(typval_T *argvars, typval_T *rettv, int comp)
|
||||
int c = (clen > 1) ? utf_ptr2char(t) : *t;
|
||||
if (c > 0xFFFF)
|
||||
idx--;
|
||||
if (idx > 0)
|
||||
t += clen;
|
||||
}
|
||||
if (idx > 0)
|
||||
else if (idx > 0)
|
||||
t += ptr2len(t);
|
||||
}
|
||||
rettv->vval.v_number = (varnumber_T)(t - str);
|
||||
@@ -2243,7 +2245,7 @@ f_utf16idx(typval_T *argvars, typval_T *rettv)
|
||||
int c = (clen > 1) ? utf_ptr2char(p) : *p;
|
||||
if (c > 0xFFFF)
|
||||
len++;
|
||||
p += ptr2len(p);
|
||||
p += clen;
|
||||
if (charidx)
|
||||
idx--;
|
||||
}
|
||||
|
||||
@@ -734,6 +734,8 @@ static char *(features[]) =
|
||||
|
||||
static int included_patches[] =
|
||||
{ /* Add new patch number below this line */
|
||||
/**/
|
||||
108,
|
||||
/**/
|
||||
107,
|
||||
/**/
|
||||
|
||||
Reference in New Issue
Block a user