aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/parse_util.cpp
diff options
context:
space:
mode:
authorGravatar Kurtis Rader <krader@skepticism.us>2016-04-04 14:34:28 -0700
committerGravatar Kurtis Rader <krader@skepticism.us>2016-04-04 14:34:28 -0700
commit47f1a92cc4c3c7056f4172974f10a8dd402cf55c (patch)
tree34bf83341006081f8a07bc6ca77cac03c603eb97 /src/parse_util.cpp
parent0953590cca7cdc2dab75af5a85c8e2f15d4b8ab2 (diff)
fixes for cppcheck lint warnings
Refine the linting behavior. Fix several of the, mostly trivial, lint errors.
Diffstat (limited to 'src/parse_util.cpp')
-rw-r--r--src/parse_util.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/parse_util.cpp b/src/parse_util.cpp
index 628e86c5..73db2833 100644
--- a/src/parse_util.cpp
+++ b/src/parse_util.cpp
@@ -1020,14 +1020,16 @@ static const wchar_t *error_format_for_character(wchar_t wc)
void parse_util_expand_variable_error(const wcstring &token, size_t global_token_pos, size_t dollar_pos, parse_error_list_t *errors)
{
- // Note that dollar_pos is probably VARIABLE_EXPAND or VARIABLE_EXPAND_SINGLE, not a literal dollar sign
+ // Note that dollar_pos is probably VARIABLE_EXPAND or VARIABLE_EXPAND_SINGLE,
+ // not a literal dollar sign.
assert(errors != NULL);
assert(dollar_pos < token.size());
const bool double_quotes = (token.at(dollar_pos) == VARIABLE_EXPAND_SINGLE);
const size_t start_error_count = errors->size();
const size_t global_dollar_pos = global_token_pos + dollar_pos;
const size_t global_after_dollar_pos = global_dollar_pos + 1;
- wchar_t char_after_dollar = (dollar_pos + 1 >= token.size() ? L'\0' : token.at(dollar_pos + 1));
+ wchar_t char_after_dollar = dollar_pos + 1 >= token.size() ? 0 : token.at(dollar_pos + 1);
+
switch (char_after_dollar)
{
case BRACKET_BEGIN: