aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/env.cpp
diff options
context:
space:
mode:
authorGravatar Kurtis Rader <krader@skepticism.us>2016-05-28 22:28:26 -0700
committerGravatar Kurtis Rader <krader@skepticism.us>2016-05-29 22:24:29 -0700
commit5bf1b0e5f500b6b99a866da32dd9002219cac6d6 (patch)
tree4622863e7f28ad7f840d6a7096057286aee4e750 /src/env.cpp
parent3d19b549c8d9fc77597d0de95260e90f5dda2dae (diff)
fix random lint issues
This only eliminates errors reported by `make lint`. It shouldn't cause any functional changes. This change does remove several functions that are unused. It also removes the `desc_arr` variable which is both unused and out of date with reality.
Diffstat (limited to 'src/env.cpp')
-rw-r--r--src/env.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/env.cpp b/src/env.cpp
index 381b4588..e09064ad 100644
--- a/src/env.cpp
+++ b/src/env.cpp
@@ -699,7 +699,7 @@ env_var_t env_get_string(const wcstring &key, env_mode_flags_t mode) {
if (search_local || search_global) {
/* Lock around a local region */
- scoped_lock lock(env_lock);
+ scoped_lock lock(env_lock); //!OCLINT(has side effects)
env_node_t *env = search_local ? top : global_env;
@@ -869,7 +869,7 @@ static void add_key_to_string_set(const var_table_t &envs, std::set<wcstring> *s
}
wcstring_list_t env_get_names(int flags) {
- scoped_lock lock(env_lock);
+ scoped_lock lock(env_lock); //!OCLINT(has side effects)
wcstring_list_t result;
std::set<wcstring> names;