diff options
author | bfredl <bjorn.linse@gmail.com> | 2022-07-02 17:13:25 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-07-02 17:13:25 +0200 |
commit | c1b591dc8f99577c419192c7b34e3999758ed69f (patch) | |
tree | b8d61ff93b47fdec47982f0452d76975226322ae /src/nvim/os/env.c | |
parent | ed429c00d76414d07d7c7129f65ddf9be68e24f4 (diff) | |
parent | 3b8804571c565a91c9ce729bb487c7ba21b659e0 (diff) | |
download | rneovim-c1b591dc8f99577c419192c7b34e3999758ed69f.tar.gz rneovim-c1b591dc8f99577c419192c7b34e3999758ed69f.tar.bz2 rneovim-c1b591dc8f99577c419192c7b34e3999758ed69f.zip |
Merge pull request #19137 from dundargoc/refactor/char_u-to-char
refactor: replace char_u
Diffstat (limited to 'src/nvim/os/env.c')
-rw-r--r-- | src/nvim/os/env.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/nvim/os/env.c b/src/nvim/os/env.c index 2a7f7a221f..9c93057fe7 100644 --- a/src/nvim/os/env.c +++ b/src/nvim/os/env.c @@ -884,7 +884,7 @@ void vim_get_prefix_from_exepath(char *exe_name) // TODO(bfredl): param could have been written as "char exe_name[MAXPATHL]" // but c_grammar.lua does not recognize it (yet). xstrlcpy(exe_name, get_vim_var_str(VV_PROGPATH), MAXPATHL * sizeof(*exe_name)); - char *path_end = (char *)path_tail_with_sep((char_u *)exe_name); + char *path_end = path_tail_with_sep(exe_name); *path_end = '\0'; // remove the trailing "nvim.exe" path_end = path_tail(exe_name); *path_end = '\0'; // remove the trailing "bin/" @@ -1143,15 +1143,16 @@ size_t home_replace(const buf_T *const buf, const char *src, char *const dst, si /// Like home_replace, store the replaced string in allocated memory. /// @param buf When not NULL, check for help files /// @param src Input file name -char_u *home_replace_save(buf_T *buf, char_u *src) FUNC_ATTR_NONNULL_RET +char *home_replace_save(buf_T *buf, char *src) + FUNC_ATTR_NONNULL_RET { size_t len = 3; // space for "~/" and trailing NUL if (src != NULL) { // just in case len += STRLEN(src); } char *dst = xmalloc(len); - home_replace(buf, (char *)src, dst, len, true); - return (char_u *)dst; + home_replace(buf, src, dst, len, true); + return dst; } /// Function given to ExpandGeneric() to obtain an environment variable name. @@ -1189,7 +1190,7 @@ bool os_setenv_append_path(const char *fname) internal_error("os_setenv_append_path()"); return false; } - const char *tail = (char *)path_tail_with_sep((char_u *)fname); + const char *tail = path_tail_with_sep((char *)fname); size_t dirlen = (size_t)(tail - fname); assert(tail >= fname && dirlen + 1 < sizeof(os_buf)); xstrlcpy(os_buf, fname, dirlen + 1); |