diff options
| author | Lucas Merritt <lucas.j.merritt@gmail.com> | 2023-03-24 22:11:14 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-25 12:11:14 +0800 |
| commit | 063e93864a7e99ac1c4781bbe4ea63c0adb075a8 (patch) | |
| tree | d7095e5365a1d8505545775e6032c58c03d7a80d | |
| parent | aab4443bb907a0cf7ef874c22f8cfae667b65552 (diff) | |
| download | rneovim-063e93864a7e99ac1c4781bbe4ea63c0adb075a8.tar.gz rneovim-063e93864a7e99ac1c4781bbe4ea63c0adb075a8.tar.bz2 rneovim-063e93864a7e99ac1c4781bbe4ea63c0adb075a8.zip | |
refactor(PVS/V1048): remove duplicated assignments (#21873)
| -rw-r--r-- | src/nvim/eval/funcs.c | 2 | ||||
| -rw-r--r-- | src/nvim/insexpand.c | 4 | ||||
| -rw-r--r-- | src/nvim/path.c | 1 | ||||
| -rw-r--r-- | src/nvim/regexp_nfa.c | 1 | ||||
| -rw-r--r-- | src/nvim/shada.c | 1 |
5 files changed, 2 insertions, 7 deletions
diff --git a/src/nvim/eval/funcs.c b/src/nvim/eval/funcs.c index 3a7da21606..df8004dc73 100644 --- a/src/nvim/eval/funcs.c +++ b/src/nvim/eval/funcs.c @@ -7581,7 +7581,7 @@ static void f_settagstack(typval_T *argvars, typval_T *rettv, EvalFuncData fptr) // third argument: action - 'a' for append and 'r' for replace. // default is to replace the stack. if (argvars[2].v_type == VAR_UNKNOWN) { - action = 'r'; + // action = 'r'; } else if (argvars[2].v_type == VAR_STRING) { const char *actstr; actstr = tv_get_string_chk(&argvars[2]); diff --git a/src/nvim/insexpand.c b/src/nvim/insexpand.c index c61c74c607..7100146245 100644 --- a/src/nvim/insexpand.c +++ b/src/nvim/insexpand.c @@ -2890,7 +2890,7 @@ static int process_next_cpt_value(ins_compl_next_state_T *st, int *compl_type_ar status = INS_COMPL_CPT_END; } else { if (ctrl_x_mode_line_or_eval()) { - compl_type = -1; + // compl_type = -1; } else if (*st->e_cpt == 'k' || *st->e_cpt == 's') { if (*st->e_cpt == 'k') { compl_type = CTRL_X_DICTIONARY; @@ -2912,8 +2912,6 @@ static int process_next_cpt_value(ins_compl_next_state_T *st, int *compl_type_ar vim_snprintf(IObuff, IOSIZE, "%s", _("Scanning tags.")); (void)msg_trunc_attr(IObuff, true, HL_ATTR(HLF_R)); } - } else { - compl_type = -1; } // in any case e_cpt is advanced to the next entry diff --git a/src/nvim/path.c b/src/nvim/path.c index 9bbf56276e..973e5eaec4 100644 --- a/src/nvim/path.c +++ b/src/nvim/path.c @@ -2375,7 +2375,6 @@ static int path_to_absolute(const char *fname, char *buf, size_t len, int force) end_of_path = p + 1; } else { relative_directory[0] = NUL; - end_of_path = (char *)fname; } if (FAIL == path_full_dir_name(relative_directory, buf, len)) { diff --git a/src/nvim/regexp_nfa.c b/src/nvim/regexp_nfa.c index ea59e7d464..950814880b 100644 --- a/src/nvim/regexp_nfa.c +++ b/src/nvim/regexp_nfa.c @@ -2238,7 +2238,6 @@ collection: } // Failed to recognize a character class. Use the simple // version that turns [abc] into 'a' OR 'b' OR 'c' - startc = -1; negated = false; if (*regparse == '^') { // negated range negated = true; diff --git a/src/nvim/shada.c b/src/nvim/shada.c index 98f10c0082..3f816d0172 100644 --- a/src/nvim/shada.c +++ b/src/nvim/shada.c @@ -3602,7 +3602,6 @@ shada_read_next_item_start: ret = spm_ret; goto shada_read_next_item_error; } - ret = kSDReadStatusMalformed; entry->data = sd_default_values[type_u64].data; switch ((ShadaEntryType)type_u64) { case kSDItemHeader: |