mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-14 15:28:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor get_env() to respect const qualifier

Browse Source 
Without the casts*, the compiler rightly warns about the os_getenv
losing the qualifier.  This refactor adds a variable to manage this
properly, and renames the original variables to increase clarity.
This commit is contained in:
Mark Bainter
2015-04-12 22:31:00 +00:00
parent 08c08ecdf3
commit a7e17de048
6 changed files with 121 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/nvim/eval.c
View File

@@ -1751,13 +1751,11 @@ ex_let_one (
name[len] = NUL;
p = get_tv_string_chk(tv);
if (p != NULL && op != NULL && *op == '.') {
bool mustfree = false;
char *s = vim_getenv((char *)name, &mustfree);
char *s = vim_getenv((char *)name);
if (s != NULL) {
p = tofree = concat_str((char_u *)s, p);
if (mustfree)
xfree(s);
xfree(s);
}
}
if (p != NULL) {
@@ -6357,7 +6355,6 @@ static int get_env_tv(char_u **arg, typval_T *rettv, int evaluate)
{
char_u *name;
char_u *string = NULL;
bool mustfree = false;
int len;
int cc;
@@ -6372,15 +6369,9 @@ static int get_env_tv(char_u **arg, typval_T *rettv, int evaluate)
cc = name[len];
name[len] = NUL;
// First try vim_getenv(), fast for normal environment vars.
string = (char_u *)vim_getenv((char *)name, &mustfree);
if (string != NULL && *string != NUL) {
if (!mustfree) {
string = vim_strsave(string);
}
} else {
if (mustfree) {
xfree(string);
}
string = (char_u *)vim_getenv((char *)name);
if (string == NULL || *string == NUL) {
xfree(string);
// Next try expanding things like $VIM and ${HOME}.
string = expand_env_save(name - 1);