diff options
| author | bfredl <bjorn.linse@gmail.com> | 2022-09-12 21:50:31 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-12 21:50:31 +0200 |
| commit | f6232e160b96e2607edcd5afa7207a1e4aadf805 (patch) | |
| tree | 41fa053ec7eff6b7edd278ec892392896f984722 /src/nvim/memline.c | |
| parent | fd70e2bff2440181f63fe124738cf2a025d1e6a5 (diff) | |
| parent | 3ff46544c9872b4161fd098569c30b55fe3abd36 (diff) | |
| download | rneovim-f6232e160b96e2607edcd5afa7207a1e4aadf805.tar.gz rneovim-f6232e160b96e2607edcd5afa7207a1e4aadf805.tar.bz2 rneovim-f6232e160b96e2607edcd5afa7207a1e4aadf805.zip | |
Merge pull request #20077 from dundargoc/refactor/char_u/11
refactor: replace char_u with char 11: remove `STRLEN` part 1
Diffstat (limited to 'src/nvim/memline.c')
| -rw-r--r-- | src/nvim/memline.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/nvim/memline.c b/src/nvim/memline.c index 9d1ad5903d..b374010f80 100644 --- a/src/nvim/memline.c +++ b/src/nvim/memline.c @@ -627,7 +627,7 @@ static void set_b0_fname(ZERO_BL *b0p, buf_T *buf) if (b0p->b0_fname[0] == '~') { // If there is no user name or it is too long, don't use "~/" int retval = os_get_username(uname, B0_UNAME_SIZE); - size_t ulen = STRLEN(uname); + size_t ulen = strlen(uname); size_t flen = STRLEN(b0p->b0_fname); if (retval == FAIL || ulen + flen > B0_FNAME_SIZE_CRYPT - 1) { STRLCPY(b0p->b0_fname, buf->b_ffname, B0_FNAME_SIZE_CRYPT); @@ -678,7 +678,7 @@ static void add_b0_fenc(ZERO_BL *b0p, buf_T *buf) int n; int size = B0_FNAME_SIZE_NOCRYPT; - n = (int)STRLEN(buf->b_p_fenc); + n = (int)strlen(buf->b_p_fenc); if ((int)STRLEN(b0p->b0_fname) + n + 1 > size) { b0p->b0_flags &= (uint8_t) ~B0_HAS_FENC; } else { @@ -736,7 +736,7 @@ void ml_recover(bool checkext) if (fname == NULL) { // When there is no file name fname = ""; } - len = (int)STRLEN(fname); + len = (int)strlen(fname); if (checkext && len >= 4 && STRNICMP(fname + len - 4, ".s", 2) == 0 && vim_strchr("abcdefghijklmnopqrstuvw", TOLOWER_ASC(fname[len - 2])) != NULL @@ -1221,7 +1221,7 @@ int recover_names(char_u *fname, int list, int nr, char **fname_out) // Do the loop for every directory in 'directory'. // First allocate some memory to put the directory name in. - dir_name = xmalloc(STRLEN(p_dir) + 1); + dir_name = xmalloc(strlen(p_dir) + 1); dirp = p_dir; while (*dirp) { // Isolate a directory name from *dirp and put it in dir_name (we know @@ -3029,7 +3029,7 @@ int resolve_symlink(const char *fname, char *buf) STRCPY(tmp, buf); } else { char_u *tail = (char_u *)path_tail(tmp); - if (STRLEN(tail) + STRLEN(buf) >= MAXPATHL) { + if (STRLEN(tail) + strlen(buf) >= MAXPATHL) { return FAIL; } STRCPY(tail, buf); |