Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-12-29 06:13:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

Rename my_env_set to more useful env_set_reporting_errors

Browse source
This commit is contained in:
ridiculousfish 2018-09-11 09:32:44 -07:00
parent 0f141b6ccf
commit ce174afabf
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/builtin_set.cpp
View file

@ -320,8 +320,8 @@ static void handle_env_return(int retval, const wchar_t *cmd, const wchar_t *key
/// Call env_set. If this is a path variable, e.g. PATH, validate the elements. On error, print a /// Call env_set. If this is a path variable, e.g. PATH, validate the elements. On error, print a
/// description of the problem to stderr. /// description of the problem to stderr.
static int my_env_set(const wchar_t *cmd, const wchar_t *key, int scope, wcstring_list_t &list, static int env_set_reporting_errors(const wchar_t *cmd, const wchar_t *key, int scope,
io_streams_t &streams) { wcstring_list_t &list, io_streams_t &streams) {
if (is_path_variable(key) && !validate_path_warning_on_colons(cmd, key, list, streams)) { if (is_path_variable(key) && !validate_path_warning_on_colons(cmd, key, list, streams)) {
return STATUS_CMD_ERROR; return STATUS_CMD_ERROR;
} }
@ -639,7 +639,7 @@ static int builtin_set_erase(const wchar_t *cmd, set_cmd_opts_t &opts, int argc,
wcstring_list_t result; wcstring_list_t result;
dest_var->to_list(result); dest_var->to_list(result);
erase_values(result, indexes); erase_values(result, indexes);
retval = my_env_set(cmd, dest, scope, result, streams); retval = env_set_reporting_errors(cmd, dest, scope, result, streams);
} }
if (retval != STATUS_CMD_OK) return retval; if (retval != STATUS_CMD_OK) return retval;
@ -748,7 +748,7 @@ static int builtin_set_set(const wchar_t *cmd, set_cmd_opts_t &opts, int argc, w
} }
if (retval != STATUS_CMD_OK) return retval; if (retval != STATUS_CMD_OK) return retval;
retval = my_env_set(cmd, varname, scope, new_values, streams); retval = env_set_reporting_errors(cmd, varname, scope, new_values, streams);
if (retval != STATUS_CMD_OK) return retval; if (retval != STATUS_CMD_OK) return retval;
return check_global_scope_exists(cmd, opts, varname, streams); return check_global_scope_exists(cmd, opts, varname, streams);
} }