aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/builtin_commandline.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/builtin_commandline.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/builtin_commandline.cpp')
-rw-r--r--src/builtin_commandline.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/builtin_commandline.cpp b/src/builtin_commandline.cpp
index c25e6041..0a76ef84 100644
--- a/src/builtin_commandline.cpp
+++ b/src/builtin_commandline.cpp
@@ -67,7 +67,7 @@ static wcstring_list_t *get_transient_stack() {
static bool get_top_transient(wcstring *out_result) {
ASSERT_IS_MAIN_THREAD();
bool result = false;
- scoped_lock locker(transient_commandline_lock);
+ scoped_lock locker(transient_commandline_lock); //!OCLINT(side-effect)
const wcstring_list_t *stack = get_transient_stack();
if (!stack->empty()) {
out_result->assign(stack->back());
@@ -79,7 +79,7 @@ static bool get_top_transient(wcstring *out_result) {
builtin_commandline_scoped_transient_t::builtin_commandline_scoped_transient_t(
const wcstring &cmd) {
ASSERT_IS_MAIN_THREAD();
- scoped_lock locker(transient_commandline_lock);
+ scoped_lock locker(transient_commandline_lock); //!OCLINT(side-effect)
wcstring_list_t *stack = get_transient_stack();
stack->push_back(cmd);
this->token = stack->size();
@@ -87,7 +87,7 @@ builtin_commandline_scoped_transient_t::builtin_commandline_scoped_transient_t(
builtin_commandline_scoped_transient_t::~builtin_commandline_scoped_transient_t() {
ASSERT_IS_MAIN_THREAD();
- scoped_lock locker(transient_commandline_lock);
+ scoped_lock locker(transient_commandline_lock); //!OCLINT(side-effect)
wcstring_list_t *stack = get_transient_stack();
assert(this->token == stack->size());
stack->pop_back();