refactor: fix clang and PVS warnings (#19532)

9 files changed, 12 insertions, 9 deletions

diff --git a/src/nvim/eval/vars.c b/src/nvim/eval/vars.c
index 1aecb40e0b..dec3ef68aa 100644
--- a/src/nvim/eval/vars.c
+++ b/src/nvim/eval/vars.c
@@ -514,6 +514,7 @@ static const char *list_arg_vars(exarg_T *eap, const char *arg, int *first)
               const char *const used_name = (arg == arg_subsc
                                              ? name
                                              : name_start);
+              assert(used_name != NULL);
               const ptrdiff_t name_size = (used_name == tofree
                                            ? (ptrdiff_t)strlen(used_name)
                                            : (arg - used_name));
diff --git a/src/nvim/ex_docmd.c b/src/nvim/ex_docmd.c
index ed5c074577..bf78de1f8c 100644
--- a/src/nvim/ex_docmd.c
+++ b/src/nvim/ex_docmd.c
@@ -3052,6 +3052,7 @@ char *find_ex_command(exarg_T *eap, int *full)
     } else {
       eap->cmdidx = CMD_bang;
     }
+    assert(eap->cmdidx >= 0);
 
     for (; (int)eap->cmdidx < CMD_SIZE;
          eap->cmdidx = (cmdidx_T)((int)eap->cmdidx + 1)) {
diff --git a/src/nvim/ex_getln.c b/src/nvim/ex_getln.c
index 906e52f183..1ee8581e00 100644
--- a/src/nvim/ex_getln.c
+++ b/src/nvim/ex_getln.c
@@ -3336,7 +3336,7 @@ static void ui_ext_cmdline_show(CmdlineInfo *line)
 {
   Arena arena = ARENA_EMPTY;
   arena_start(&arena, &ui_ext_fixblk);
-  Array content = ARRAY_DICT_INIT;
+  Array content;
   if (cmdline_star) {
     content = arena_array(&arena, 1);
     size_t len = 0;
diff --git a/src/nvim/highlight_group.c b/src/nvim/highlight_group.c
index ae8a6877b0..f6ec03fb14 100644
--- a/src/nvim/highlight_group.c
+++ b/src/nvim/highlight_group.c
@@ -956,8 +956,8 @@ void do_highlight(const char *line, const bool forceit, const bool init)
         linep++;
       }
       size_t key_len = (size_t)(linep - key_start);
-      if (key_len > sizeof key - 1) {
-        semsg(_("E423: Illegal argument"));
+      if (key_len > sizeof(key) - 1) {
+        emsg(_("E423: Illegal argument"));
         error = true;
         break;
       }
@@ -1004,8 +1004,8 @@ void do_highlight(const char *line, const bool forceit, const bool init)
         break;
       }
       size_t arg_len = (size_t)(linep - arg_start);
-      if (arg_len > sizeof arg - 1) {
-        semsg(_("E423: Illegal argument"));
+      if (arg_len > sizeof(arg) - 1) {
+        emsg(_("E423: Illegal argument"));
         error = true;
         break;
       }
diff --git a/src/nvim/log.c b/src/nvim/log.c
index 57c7c4758b..99b17a612b 100644
--- a/src/nvim/log.c
+++ b/src/nvim/log.c
@@ -310,7 +310,7 @@ static bool v_do_log_to_file(FILE *log_file, int log_level, const char *context,
     const char *parent = path_tail(os_getenv(ENV_NVIM));
     // Servername. Empty until starting=false.
     const char *serv = path_tail(get_vim_var_str(VV_SEND_SERVER));
-    if (parent && parent[0] != NUL) {
+    if (parent[0] != NUL) {
       snprintf(name, sizeof(name), "%s/c", parent);  // "/c" indicates child.
     } else if (serv[0] != NUL) {
       snprintf(name, sizeof(name), "%s", serv);
diff --git a/src/nvim/mark.c b/src/nvim/mark.c
index b7d0e9b401..1fe3327b29 100644
--- a/src/nvim/mark.c
+++ b/src/nvim/mark.c
@@ -491,7 +491,7 @@ fmark_T *mark_get_visual(buf_T *buf, int name)
       mark = pos_to_mark(buf, NULL, endp);
     }
 
-    if (mark != NULL && buf->b_visual.vi_mode == 'V') {
+    if (buf->b_visual.vi_mode == 'V') {
       if (name == '<') {
         mark->mark.col = 0;
       } else {
diff --git a/src/nvim/msgpack_rpc/unpacker.c b/src/nvim/msgpack_rpc/unpacker.c
index d73557ec11..c8e9fdd4c3 100644
--- a/src/nvim/msgpack_rpc/unpacker.c
+++ b/src/nvim/msgpack_rpc/unpacker.c
@@ -425,8 +425,8 @@ redo:
       arena_start(&p->arena, &p->reuse_blk);
       p->grid_line_event = arena_alloc(&p->arena, sizeof *p->grid_line_event, true);
       g = p->grid_line_event;
-      FALLTHROUGH;
     }
+    FALLTHROUGH;
 
   case 13:
     NEXT_TYPE(tok, MPACK_TOKEN_ARRAY);
diff --git a/src/nvim/normal.c b/src/nvim/normal.c
index 64bc868cb5..92a4b00cd0 100644
--- a/src/nvim/normal.c
+++ b/src/nvim/normal.c
@@ -5102,6 +5102,7 @@ static void nv_brackets(cmdarg_T *cap)
   } else if (cap->nchar == '\'' || cap->nchar == '`') {
     // "['", "[`", "]'" and "]`": jump to next mark
     fmark_T *fm = pos_to_mark(curbuf, NULL, curwin->w_cursor);
+    assert(fm != NULL);
     fmark_T *prev_fm;
     for (n = cap->count1; n > 0; n--) {
       prev_fm = fm;
diff --git a/src/nvim/screen.c b/src/nvim/screen.c
index 374a840144..b9c38d9339 100644
--- a/src/nvim/screen.c
+++ b/src/nvim/screen.c
@@ -2119,7 +2119,7 @@ static int win_line(win_T *wp, linenr_T lnum, int startrow, int endrow, bool noc
   bool has_decor = false;               // this buffer has decoration
   int win_col_offset = 0;               // offset for window columns
 
-  char_u buf_fold[FOLD_TEXT_LEN + 1];   // Hold value returned by get_foldtext
+  char_u buf_fold[FOLD_TEXT_LEN];       // Hold value returned by get_foldtext
 
   bool area_active = false;