IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

os/env.c: cosmetic changes done during review of the file

Browse Source
This commit is contained in:
Felipe Oliveira Carvalho 2016-04-01 08:40:00 -03:00
parent 529e2ab178
commit 049be74257
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/nvim/os/env.c
View File

@ -147,7 +147,7 @@ static char_u *homedir = NULL;
void init_homedir(void) void init_homedir(void)
{ {
/* In case we are called a second time (when 'encoding' changes). */ // In case we are called a second time (when 'encoding' changes).
xfree(homedir); xfree(homedir);
homedir = NULL; homedir = NULL;
@ -176,17 +176,17 @@ void init_homedir(void)
if (var != NULL) { if (var != NULL) {
#ifdef UNIX #ifdef UNIX
/* // Change to the directory and get the actual path. This resolves
* Change to the directory and get the actual path. This resolves // links. Don't do it when we can't return.
* links. Don't do it when we can't return.
*/
if (os_dirname(NameBuff, MAXPATHL) == OK if (os_dirname(NameBuff, MAXPATHL) == OK
&& os_chdir((char *)NameBuff) == 0) { && os_chdir((char *)NameBuff) == 0) {
if (!os_chdir((char *)var) && os_dirname(IObuff, IOSIZE) == OK) if (!os_chdir((char *)var) && os_dirname(IObuff, IOSIZE) == OK) {
var = IObuff; var = IObuff;
if (os_chdir((char *)NameBuff) != 0) }
if (os_chdir((char *)NameBuff) != 0) {
EMSG(_(e_prev_dir)); EMSG(_(e_prev_dir));
} }
}
#endif #endif
homedir = vim_strsave(var); homedir = vim_strsave(var);
} }
@ -745,9 +745,10 @@ void home_replace(buf_T *buf, char_u *src, char_u *dst, int dstlen, bool one)
/// @param src Input file name /// @param src Input file name
char_u * home_replace_save(buf_T *buf, char_u *src) FUNC_ATTR_NONNULL_RET char_u * home_replace_save(buf_T *buf, char_u *src) FUNC_ATTR_NONNULL_RET
{ {
size_t len = 3; /* space for "~/" and trailing NUL */ size_t len = 3; // space for "~/" and trailing NUL
if (src != NULL) /* just in case */ if (src != NULL) { // just in case
len += STRLEN(src); len += STRLEN(src);
}
char_u *dst = xmalloc(len); char_u *dst = xmalloc(len);
home_replace(buf, src, dst, (int)len, true); home_replace(buf, src, dst, (int)len, true);
return dst; return dst;
@ -783,8 +784,7 @@ char_u *get_env_name(expand_T *xp, int idx)
STRLCPY(name, envname, ENVNAMELEN); STRLCPY(name, envname, ENVNAMELEN);
xfree(envname); xfree(envname);
return name; return name;
} else { }
return NULL; return NULL;
} }
}