mirror of
https://github.com/neovim/neovim.git
synced 2025-02-25 18:55:25 -06:00
refactor(mbyte.c): add const qualifiers
This only touches functions that do not return a pointer. Also add a note about the differences between mb_head_off() and utf_head_off().
This commit is contained in:
parent
e16ec0be22
commit
ff81725ff0
@ -3327,7 +3327,7 @@ void maketitle(void)
|
|||||||
len = (int)STRLEN(buf_p);
|
len = (int)STRLEN(buf_p);
|
||||||
if (len > 100) {
|
if (len > 100) {
|
||||||
len -= 100;
|
len -= 100;
|
||||||
len += (*mb_tail_off)(buf_p, buf_p + len) + 1;
|
len += mb_tail_off(buf_p, buf_p + len) + 1;
|
||||||
buf_p += len;
|
buf_p += len;
|
||||||
}
|
}
|
||||||
STRCPY(icon_str, buf_p);
|
STRCPY(icon_str, buf_p);
|
||||||
|
@ -1821,12 +1821,10 @@ void mb_copy_char(const char_u **const fp, char_u **const tp)
|
|||||||
*fp += l;
|
*fp += l;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/// Return the offset from "p" to the first byte of a character. When "p" is
|
||||||
* Return the offset from "p" to the first byte of a character. When "p" is
|
/// at the start of a character 0 is returned, otherwise the offset to the next
|
||||||
* at the start of a character 0 is returned, otherwise the offset to the next
|
/// character. Can start anywhere in a stream of bytes.
|
||||||
* character. Can start anywhere in a stream of bytes.
|
int mb_off_next(const char_u *base, const char_u *p)
|
||||||
*/
|
|
||||||
int mb_off_next(char_u *base, char_u *p)
|
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
int j;
|
int j;
|
||||||
@ -1854,7 +1852,7 @@ int mb_off_next(char_u *base, char_u *p)
|
|||||||
/// Return the offset from "p" to the last byte of the character it points
|
/// Return the offset from "p" to the last byte of the character it points
|
||||||
/// into. Can start anywhere in a stream of bytes.
|
/// into. Can start anywhere in a stream of bytes.
|
||||||
/// Composing characters are not included.
|
/// Composing characters are not included.
|
||||||
int mb_tail_off(char_u *base, char_u *p)
|
int mb_tail_off(const char_u *base, const char_u *p)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
int j;
|
int j;
|
||||||
@ -1882,12 +1880,13 @@ int mb_tail_off(char_u *base, char_u *p)
|
|||||||
|
|
||||||
/// Return the offset from "p" to the first byte of the character it points
|
/// Return the offset from "p" to the first byte of the character it points
|
||||||
/// into. Can start anywhere in a stream of bytes.
|
/// into. Can start anywhere in a stream of bytes.
|
||||||
|
/// Unlike utf_head_off() this doesn't include composing characters and returns a negative value.
|
||||||
///
|
///
|
||||||
/// @param[in] base Pointer to start of string
|
/// @param[in] base Pointer to start of string
|
||||||
/// @param[in] p Pointer to byte for which to return the offset to the previous codepoint
|
/// @param[in] p Pointer to byte for which to return the offset to the previous codepoint
|
||||||
//
|
//
|
||||||
/// @return 0 if invalid sequence, else offset to previous codepoint
|
/// @return 0 if invalid sequence, else offset to previous codepoint
|
||||||
int mb_head_off(char_u *base, char_u *p)
|
int mb_head_off(const char_u *base, const char_u *p)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
int j;
|
int j;
|
||||||
@ -2037,13 +2036,11 @@ char_u *mb_prevptr(char_u *line, char_u *p)
|
|||||||
return p;
|
return p;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/// Return the character length of "str". Each multi-byte character (with
|
||||||
* Return the character length of "str". Each multi-byte character (with
|
/// following composing characters) counts as one.
|
||||||
* following composing characters) counts as one.
|
int mb_charlen(const char_u *str)
|
||||||
*/
|
|
||||||
int mb_charlen(char_u *str)
|
|
||||||
{
|
{
|
||||||
char_u *p = str;
|
const char_u *p = str;
|
||||||
int count;
|
int count;
|
||||||
|
|
||||||
if (p == NULL) {
|
if (p == NULL) {
|
||||||
@ -2057,12 +2054,10 @@ int mb_charlen(char_u *str)
|
|||||||
return count;
|
return count;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/// Like mb_charlen() but for a string with specified length.
|
||||||
* Like mb_charlen() but for a string with specified length.
|
int mb_charlen_len(const char_u *str, int len)
|
||||||
*/
|
|
||||||
int mb_charlen_len(char_u *str, int len)
|
|
||||||
{
|
{
|
||||||
char_u *p = str;
|
const char_u *p = str;
|
||||||
int count;
|
int count;
|
||||||
|
|
||||||
for (count = 0; *p != NUL && p < str + len; count++) {
|
for (count = 0; *p != NUL && p < str + len; count++) {
|
||||||
@ -2201,11 +2196,9 @@ char_u *enc_canonize(char_u *enc) FUNC_ATTR_NONNULL_RET
|
|||||||
return r;
|
return r;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/// Search for an encoding alias of "name".
|
||||||
* Search for an encoding alias of "name".
|
/// Returns -1 when not found.
|
||||||
* Returns -1 when not found.
|
static int enc_alias_search(const char_u *name)
|
||||||
*/
|
|
||||||
static int enc_alias_search(char_u *name)
|
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
|
@ -566,7 +566,7 @@ static void block_insert(oparg_T *oap, char_u *s, int b_insert, struct block_def
|
|||||||
if (b_insert) {
|
if (b_insert) {
|
||||||
off = utf_head_off(oldp, oldp + offset + spaces);
|
off = utf_head_off(oldp, oldp + offset + spaces);
|
||||||
} else {
|
} else {
|
||||||
off = (*mb_off_next)(oldp, oldp + offset);
|
off = mb_off_next(oldp, oldp + offset);
|
||||||
offset += off;
|
offset += off;
|
||||||
}
|
}
|
||||||
spaces -= off;
|
spaces -= off;
|
||||||
|
Loading…
Reference in New Issue
Block a user