refactor: remove redundant char casts #15888

src/nvim/api/private/helpers.c

@@ -396,7 +396,7 @@ void set_option_to(uint64_t channel_id, void *to, int type, String name, Object
       return;
     }
 
-    stringval = (char *)value.data.string.data;
+    stringval = value.data.string.data;
   }
 
   const sctx_T save_current_sctx = current_sctx;

src/nvim/charset.c

@@ -412,7 +412,7 @@ char *transstr(const char *const s, bool untab)
 {
   // Compute the length of the result, taking account of unprintable
   // multi-byte characters.
-  const size_t len = transstr_len((const char *)s, untab) + 1;
+  const size_t len = transstr_len(s, untab) + 1;
   char *const buf = xmalloc(len);
   transstr_buf(s, buf, len, untab);
   return buf;

src/nvim/diff.c

@@ -1110,7 +1110,7 @@ static int diff_file(diffio_T *dio)
     // Build the diff command and execute it.  Always use -a, binary
     // differences are of no use.  Ignore errors, diff returns
     // non-zero when differences have been found.
-    vim_snprintf((char *)cmd, len, "diff %s%s%s%s%s%s%s%s %s",
+    vim_snprintf(cmd, len, "diff %s%s%s%s%s%s%s%s %s",
                  diff_a_works == kFalse ? "" : "-a ",
                  "",
                  (diff_flags & DIFF_IWHITE) ? "-b " : "",

src/nvim/eval.c

@@ -514,7 +514,7 @@ int var_redir_start(char_u *name, int append)
   ga_init(&redir_ga, (int)sizeof(char), 500);
 
   // Parse the variable name (can be a dict or list entry).
-  redir_endp = (char_u *)get_lval(redir_varname, NULL, redir_lval, false, false,
+  redir_endp = get_lval(redir_varname, NULL, redir_lval, false, false,
                         0, FNE_CHECK_START);
   if (redir_endp == NULL || redir_lval->ll_name == NULL
       || *redir_endp != NUL) {
@@ -597,7 +597,7 @@ void var_redir_stop(void)
       tv.vval.v_string = redir_ga.ga_data;
       // Call get_lval() again, if it's inside a Dict or List it may
       // have changed.
-      redir_endp = (char_u *)get_lval(redir_varname, NULL, redir_lval,
+      redir_endp = get_lval(redir_varname, NULL, redir_lval,
                             false, false, 0, FNE_CHECK_START);
       if (redir_endp != NULL && redir_lval->ll_name != NULL) {
         set_var_lval(redir_lval, redir_endp, &tv, false, false, ".");
@@ -1711,7 +1711,7 @@ static const char *list_arg_vars(exarg_T *eap, const char *arg, int *first)
         if (tofree != NULL) {
           name = tofree;
         }
-        if (get_var_tv((const char *)name, len, &tv, NULL, true, false)
+        if (get_var_tv(name, len, &tv, NULL, true, false)
             == FAIL) {
           error = true;
         } else {
@@ -2023,7 +2023,7 @@ char_u *get_lval(char_u *const name, typval_T *const rettv, lval_T *const lp, co
     }
 
     lp->ll_exp_name = (char *)make_expanded_name(name, expr_start, expr_end,
-                                                 (char_u *)p);
+                                                 p);
     lp->ll_name = lp->ll_exp_name;
     if (lp->ll_exp_name == NULL) {
       /* Report an invalid expression in braces, unless the
@@ -2419,7 +2419,7 @@ static void set_var_lval(lval_T *lp, char_u *endp, typval_T *rettv, int copy, co
 
       // handle +=, -=, *=, /=, %= and .=
       di = NULL;
-      if (get_var_tv((const char *)lp->ll_name, (int)STRLEN(lp->ll_name),
+      if (get_var_tv(lp->ll_name, (int)STRLEN(lp->ll_name),
                      &tv, &di, true, false) == OK) {
         if ((di == NULL
              || (!var_check_ro(di->di_flags, lp->ll_name, TV_CSTRING)
@@ -3004,12 +3004,12 @@ int do_unlet(const char *const name, const size_t name_len, const bool forceit)
 
     hashitem_T *hi = hash_find(ht, (const char_u *)varname);
     if (HASHITEM_EMPTY(hi)) {
-      hi = find_hi_in_scoped_ht((const char *)name, &ht);
+      hi = find_hi_in_scoped_ht(name, &ht);
     }
     if (hi != NULL && !HASHITEM_EMPTY(hi)) {
       dictitem_T *const di = TV_DICT_HI2DI(hi);
-      if (var_check_fixed(di->di_flags, (const char *)name, TV_CSTRING)
+      if (var_check_fixed(di->di_flags, name, TV_CSTRING)
-          || var_check_ro(di->di_flags, (const char *)name, TV_CSTRING)
+          || var_check_ro(di->di_flags, name, TV_CSTRING)
           || var_check_lock(d->dv_lock, name, TV_CSTRING)) {
         return FAIL;
       }
@@ -3069,7 +3069,7 @@ static int do_lock_var(lval_T *lp, char_u *name_end FUNC_ATTR_UNUSED, exarg_T *e
       ret = FAIL;
     } else {
       // Normal name or expanded name.
-      dictitem_T *const di = find_var((const char *)lp->ll_name, lp->ll_name_len, NULL,
+      dictitem_T *const di = find_var(lp->ll_name, lp->ll_name_len, NULL,
                                       true);
       if (di == NULL) {
         ret = FAIL;
@@ -4348,7 +4348,7 @@ static int call_func_rettv(char_u **const arg, typval_T *const rettv, const bool
   funcexe.selfdict = selfdict;
   funcexe.basetv = basetv;
   const int ret = get_func_tv(funcname, is_lua ? *arg - funcname : -1, rettv,
-                              (char_u **)arg, &funcexe);
+                              arg, &funcexe);
 
   // Clear the funcref afterwards, so that deleting it while
   // evaluating the arguments is possible (see test55).
@@ -9444,7 +9444,7 @@ static void set_var_const(const char *name, const size_t name_len, typval_T *con
 
   // Search in parent scope which is possible to reference from lambda
   if (v == NULL) {
-    v = find_var_in_scoped_ht((const char *)name, name_len, true);
+    v = find_var_in_scoped_ht(name, name_len, true);
   }
 
   if (tv_is_func(*tv) && !var_check_func_name(name, v == NULL)) {
@@ -9654,7 +9654,7 @@ bool var_check_func_name(const char *const name, const bool new_var)
   // Don't allow hiding a function.  When "v" is not NULL we might be
   // assigning another function to the same var, the type is checked
   // below.
-  if (new_var && function_exists((const char *)name, false)) {
+  if (new_var && function_exists(name, false)) {
     EMSG2(_("E705: Variable name conflicts with existing function: %s"),
           name);
     return false;
@@ -11325,7 +11325,7 @@ bool var_exists(const char *var)
 
   // get_name_len() takes care of expanding curly braces
   const char *name = var;
-  const int len = get_name_len((const char **)&var, &tofree, true, false);
+  const int len = get_name_len(&var, &tofree, true, false);
   if (len > 0) {
     typval_T tv;
 

src/nvim/eval/encode.c

@@ -268,9 +268,8 @@ int encode_read_from_list(ListReaderState *const state, char *const buf, const s
            || TV_LIST_ITEM_TV(state->li)->vval.v_string != NULL);
     for (size_t i = state->offset; i < state->li_length && p < buf_end; i++) {
       assert(TV_LIST_ITEM_TV(state->li)->vval.v_string != NULL);
-      const char ch = (char)(
+      const char ch = (char)(TV_LIST_ITEM_TV(state->li)->vval.v_string[state->offset++]);
-                             TV_LIST_ITEM_TV(state->li)->vval.v_string[state->offset++]);
+      *p++ = (char)(ch == (char)NL ? (char)NUL : ch);
-      *p++ = (char)((char)ch == (char)NL ? (char)NUL : (char)ch);
     }
     if (p < buf_end) {
       state->li = TV_LIST_ITEM_NEXT(state->list, state->li);

src/nvim/eval/funcs.c

@@ -5149,7 +5149,7 @@ static void f_islocked(typval_T *argvars, typval_T *rettv, FunPtr fptr)
       EMSG(_(e_trailing));
     } else {
       if (lv.ll_tv == NULL) {
-        di = find_var((const char *)lv.ll_name, lv.ll_name_len, NULL, true);
+        di = find_var(lv.ll_name, lv.ll_name_len, NULL, true);
         if (di != NULL) {
           // Consider a variable locked when:
           // 1. the variable itself is locked
@@ -5984,7 +5984,7 @@ static void get_maparg(typval_T *argvars, typval_T *rettv, int exact)
 static void f_luaeval(typval_T *argvars, typval_T *rettv, FunPtr fptr)
   FUNC_ATTR_NONNULL_ALL
 {
-  const char *const str = (const char *)tv_get_string_chk(&argvars[0]);
+  const char *const str = tv_get_string_chk(&argvars[0]);
   if (str == NULL) {
     return;
   }
@@ -11358,7 +11358,7 @@ static void f_termopen(typval_T *argvars, typval_T *rettv, FunPtr fptr)
     if (new_cwd && *new_cwd != NUL) {
       cwd = new_cwd;
       // The new cwd must be a directory.
-      if (!os_isdir_executable((const char *)cwd)) {
+      if (!os_isdir_executable(cwd)) {
         EMSG2(_(e_invarg2), "expected valid directory");
         shell_free_argv(argv);
         return;

src/nvim/eval/typval.c

@@ -3260,7 +3260,7 @@ const char *tv_get_string(const typval_T *const tv)
 const char *tv_get_string_buf(const typval_T *const tv, char *const buf)
   FUNC_ATTR_NONNULL_ALL FUNC_ATTR_NONNULL_RET FUNC_ATTR_WARN_UNUSED_RESULT
 {
-  const char *const res = (const char *)tv_get_string_buf_chk(tv, buf);
+  const char *const res = tv_get_string_buf_chk(tv, buf);
 
   return res != NULL ? res : "";
 }

src/nvim/ex_getln.c

@@ -3037,7 +3037,7 @@ static void ui_ext_cmdline_show(CmdlineInfo *line)
                        line->cmdindent,
                        line->level);
   if (line->special_char) {
-    ui_call_cmdline_special_char(cchar_to_string((char)(line->special_char)),
+    ui_call_cmdline_special_char(cchar_to_string(line->special_char),
                                  line->special_shift,
                                  line->level);
   }
@@ -3135,7 +3135,7 @@ void putcmdline(char c, int shift)
     }
     msg_no_more = false;
   } else if (ccline.redraw_state != kCmdRedrawAll) {
-    ui_call_cmdline_special_char(cchar_to_string((char)(c)), shift,
+    ui_call_cmdline_special_char(cchar_to_string(c), shift,
                                  ccline.level);
   }
   cursorcmd();

src/nvim/getchar.c

@@ -523,7 +523,7 @@ void restoreRedobuff(save_redo_T *save_redo)
 void AppendToRedobuff(const char *s)
 {
   if (!block_redo) {
-    add_buff(&redobuff, (const char *)s, -1L);
+    add_buff(&redobuff, s, -1L);
   }
 }
 
@@ -2861,7 +2861,7 @@ int buf_do_map(int maptype, MapArguments *args, int mode, bool is_abbrev, buf_T
   }
 
   char_u *lhs = (char_u *)&args->lhs;
-  char_u *rhs = (char_u *)args->rhs;
+  char_u *rhs = args->rhs;
   char_u *orig_rhs = args->orig_rhs;
 
   // check arguments and translate function keys

src/nvim/message.c

@@ -3191,7 +3191,7 @@ static void redir_write(const char *const str, const ptrdiff_t maxlen)
 
     size_t len = maxlen == -1 ? STRLEN(s) : (size_t)maxlen;
     if (capture_ga) {
-      ga_concat_len(capture_ga, (const char *)str, len);
+      ga_concat_len(capture_ga, str, len);
     }
     if (redir_reg) {
       write_reg_contents(redir_reg, s, len, true);

src/nvim/os/fs.c

@@ -134,7 +134,7 @@ bool os_isdir(const char_u *name)
 bool os_isdir_executable(const char *name)
   FUNC_ATTR_NONNULL_ALL
 {
-  int32_t mode = os_getperm((const char *)name);
+  int32_t mode = os_getperm(name);
   if (mode < 0) {
     return false;
   }

src/nvim/quickfix.c

@@ -1823,7 +1823,7 @@ static int qf_add_entry(qf_list_T *qfl, char_u *dir, char_u *fname, char_u *modu
   if (type != 1 && !vim_isprintc(type)) {  // only printable chars allowed
     type = 0;
   }
-  qfp->qf_type = (char_u)type;
+  qfp->qf_type = type;
   qfp->qf_valid = valid;
 
   lastp = &qfl->qf_last;

src/nvim/runtime.c

@@ -335,7 +335,7 @@ int do_in_path_and_pp(char_u *path, char_u *name, int flags, DoInRuntimepathCB c
 static void push_path(RuntimeSearchPath *search_path, Map(String, handle_T) *rtp_used,
                       char *entry, bool after)
 {
-  handle_T h = map_get(String, handle_T)(rtp_used, cstr_as_string((char *)entry));
+  handle_T h = map_get(String, handle_T)(rtp_used, cstr_as_string(entry));
   if (h == 0) {
     char *allocated = xstrdup(entry);
     map_put(String, handle_T)(rtp_used, cstr_as_string(allocated), 1);
@@ -776,7 +776,7 @@ static bool pack_has_entries(char_u *buf)
 {
   int num_files;
   char_u **files;
-  char_u *(pat[]) = { (char_u *)buf };
+  char_u *(pat[]) = { buf };
   if (gen_expand_wildcards(1, pat, &num_files, &files, EW_DIR) == OK) {
     FreeWild(num_files, files);
   }

src/nvim/shada.c

@@ -2694,7 +2694,7 @@ static ShaDaWriteResult shada_write(ShaDaWriteDef *const sd_writer, ShaDaReadDef
         .timestamp = sub.timestamp,
         .data = {
           .sub_string = {
-            .sub = (char *)sub.sub,
+            .sub = sub.sub,
             .additional_elements = sub.additional_elements,
           }
         }
@@ -3092,7 +3092,7 @@ shada_write_file_nomerge: {}
       // overwrite a user’s viminfo file after a "su root", with a
       // viminfo file that the user can't read.
       FileInfo old_info;
-      if (os_fileinfo((char *)fname, &old_info)) {
+      if (os_fileinfo(fname, &old_info)) {
         if (getuid() == ROOT_UID) {
           if (old_info.stat.st_uid != ROOT_UID
               || old_info.stat.st_gid != getgid()) {

src/nvim/spell.c

@@ -6073,7 +6073,7 @@ static void spell_soundfold_wsal(slang_T *slang, char_u *inword, char_u *res)
   wordlen = 0;
   for (const char_u *s = inword; *s != NUL; ) {
     const char_u *t = s;
-    c = mb_cptr2char_adv((const char_u **)&s);
+    c = mb_cptr2char_adv(&s);
     if (slang->sl_rem_accents) {
       if (utf_class(c) == 0) {
         if (did_white) {

src/nvim/undo.c

@@ -1407,7 +1407,7 @@ void u_read_undo(char *name, const char_u *hash, const char_u *orig_name FUNC_AT
     FileInfo file_info_orig;
     FileInfo file_info_undo;
     if (os_fileinfo((const char *)orig_name, &file_info_orig)
-        && os_fileinfo((char *)file_name, &file_info_undo)
+        && os_fileinfo(file_name, &file_info_undo)
         && file_info_orig.stat.st_uid != file_info_undo.stat.st_uid
         && file_info_undo.stat.st_uid != getuid()) {
       if (p_verbose > 0) {
@@ -1420,7 +1420,7 @@ void u_read_undo(char *name, const char_u *hash, const char_u *orig_name FUNC_AT
     }
 #endif
   } else {
-    file_name = (char *)name;
+    file_name = name;
   }
 
   if (p_verbose > 0) {