fix(PVS/V560): part of conditional expression is always true/false

neovim · Nov 21, 2022 · b316ac6 · b316ac6
1 parent 5c0b017
commit b316ac6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/src/nvim/api/win_config.c b/src/nvim/api/win_config.c
@@ -382,7 +382,7 @@ static void parse_border_title(Object title, Object title_pos, FloatConfig *fcon
  return;
  }
 
- if (title.type == kObjectTypeArray && title.data.array.size == 0) {
+ if (title.data.array.size == 0) {
  api_set_error(err, kErrorTypeValidation, "title cannot be an empty array");
  return;
  }
@@ -391,7 +391,6 @@ static void parse_border_title(Object title, Object title_pos, FloatConfig *fcon
  fconfig->title_chunks = parse_virt_text(title.data.array, err, &fconfig->title_width);
 
  fconfig->title = true;
- return;
 }
 
 static bool parse_title_pos(Object title_pos, FloatConfig *fconfig, Error *err)

diff --git a/src/nvim/quickfix.c b/src/nvim/quickfix.c
@@ -6711,7 +6711,7 @@ static bool mark_quickfix_ctx(qf_info_T *qi, int copyID)
  typval_T *ctx = qi->qf_lists[i].qf_ctx;
  if (ctx != NULL && ctx->v_type != VAR_NUMBER
  && ctx->v_type != VAR_STRING && ctx->v_type != VAR_FLOAT) {
- abort = abort || set_ref_in_item(ctx, copyID, NULL, NULL);
+ abort = set_ref_in_item(ctx, copyID, NULL, NULL);
  }
 
  Callback *cb = &qi->qf_lists[i].qf_qftf_cb;