patch 8.2.3460: some type casts are not needed

Problem:    Some type casts are not needed.
Solution:   Remove unnecessary type casts. (closes #8934)

diff --git a/src/autocmd.c b/src/autocmd.c
index a721e708aac8f7afd05d4b34e0ff83b7dc41bcc9..bd1ed87419f8605ee178e36b34ccd2ab5c65d54f 100644 (file)
--- a/src/autocmd.c
+++ b/src/autocmd.c
@@ -386,7 +386,7 @@ au_cleanup(void)
        return;
 
     // loop over all events
-    for (event = (event_T)0; (int)event < (int)NUM_EVENTS;
+    for (event = (event_T)0; (int)event < NUM_EVENTS;
                                            event = (event_T)((int)event + 1))
     {
        // loop over all autocommand patterns
@@ -460,7 +460,7 @@ aubuflocal_remove(buf_T *buf)
            apc->arg_bufnr = 0;
 
     // invalidate buflocals looping through events
-    for (event = (event_T)0; (int)event < (int)NUM_EVENTS;
+    for (event = (event_T)0; (int)event < NUM_EVENTS;
                                            event = (event_T)((int)event + 1))
        // loop over all autocommand patterns
        FOR_ALL_AUTOCMD_PATTERNS(event, ap)
@@ -523,7 +523,7 @@ au_del_group(char_u *name)
        AutoPat *ap;
        int     in_use = FALSE;
 
-       for (event = (event_T)0; (int)event < (int)NUM_EVENTS;
+       for (event = (event_T)0; (int)event < NUM_EVENTS;
                                            event = (event_T)((int)event + 1))
        {
            FOR_ALL_AUTOCMD_PATTERNS(event, ap)
@@ -695,7 +695,7 @@ find_end_event(
     {
        for (pat = arg; *pat && *pat != '|' && !VIM_ISWHITE(*pat); pat = p)
        {
-           if ((int)event_name2nr(pat, &p) >= (int)NUM_EVENTS)
+           if ((int)event_name2nr(pat, &p) >= NUM_EVENTS)
            {
                if (have_group)
                    semsg(_("E216: No such event: %s"), pat);
@@ -967,7 +967,7 @@ do_autocmd(exarg_T *eap, char_u *arg_in, int forceit)
        if (!forceit && *cmd != NUL)
            emsg(_(e_cannot_define_autocommands_for_all_events));
        else
-           for (event = (event_T)0; (int)event < (int)NUM_EVENTS;
+           for (event = (event_T)0; (int)event < NUM_EVENTS;
                                             event = (event_T)((int)event + 1))
                if (do_autocmd_event(event, pat,
                             once, nested, cmd, forceit, group, flags) == FAIL)

diff --git a/src/buffer.c b/src/buffer.c
index 507eb012676a94ff3ff6f74121608c9607cdccb8..5616487da913bb192f8ba071177ae627c98964c1 100644 (file)
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -103,7 +103,7 @@ read_buffer(
     retval = readfile(
            read_stdin ? NULL : curbuf->b_ffname,
            read_stdin ? NULL : curbuf->b_fname,
-           (linenr_T)line_count, (linenr_T)0, (linenr_T)MAXLNUM, eap,
+           line_count, (linenr_T)0, (linenr_T)MAXLNUM, eap,
            flags | READ_BUFFER);
     if (retval == OK)
     {

diff --git a/src/debugger.c b/src/debugger.c
index ec948eb38183fe11eaba39adab2c018f25f3f3b6..e21dd22e67985b855294fa7a0420ca23162d2246 100644 (file)
--- a/src/debugger.c
+++ b/src/debugger.c
@@ -440,7 +440,7 @@ dbg_check_breakpoint(exarg_T *eap)
            // replace K_SNR with "<SNR>"
            if (debug_breakpoint_name[0] == K_SPECIAL
                    && debug_breakpoint_name[1] == KS_EXTRA
-                   && debug_breakpoint_name[2] == (int)KE_SNR)
+                   && debug_breakpoint_name[2] == KE_SNR)
                p = (char_u *)"<SNR>";
            else
                p = (char_u *)"";

diff --git a/src/getchar.c b/src/getchar.c
index 52c77210a2453f375b069629f189db3290c6acc7..2d31c03e8bf46f0dfe45e8f371b5aa88d45eefae 100644 (file)
--- a/src/getchar.c
+++ b/src/getchar.c
@@ -1853,7 +1853,7 @@ vgetc(void)
                        // or a K_SPECIAL - KS_EXTRA - KE_CSI, which is CSI
                        // too.
                        c = vgetorpeek(TRUE);
-                       if (vgetorpeek(TRUE) == (int)KE_CSI && c == KS_EXTRA)
+                       if (vgetorpeek(TRUE) == KE_CSI && c == KS_EXTRA)
                            buf[i] = CSI;
                    }
                }
@@ -2521,7 +2521,7 @@ handle_mapping(
                    if (*s == RM_SCRIPT
                            && (mp->m_keys[0] != K_SPECIAL
                                || mp->m_keys[1] != KS_EXTRA
-                               || mp->m_keys[2] != (int)KE_SNR))
+                               || mp->m_keys[2] != KE_SNR))
                        continue;
 
                    // If one of the typed keys cannot be remapped, skip the
@@ -3139,7 +3139,7 @@ vgetorpeek(int advance)
                                    if (!VIM_ISWHITE(ptr[col]))
                                        curwin->w_wcol = vcol;
                                    vcol += lbr_chartabsize(ptr, ptr + col,
-                                                              (colnr_T)vcol);
+                                                              vcol);
                                    if (has_mbyte)
                                        col += (*mb_ptr2len)(ptr + col);
                                    else

diff --git a/src/hardcopy.c b/src/hardcopy.c
index 069fa43ddd687c516a05948b1965aa71cff1f408..a04d5d85ac4e37a99831bca0cb4cb81213121584 100644 (file)
--- a/src/hardcopy.c
+++ b/src/hardcopy.c
@@ -588,7 +588,7 @@ ex_hardcopy(exarg_T *eap)
      */
     if (mch_print_init(&settings,
                        curbuf->b_fname == NULL
-                           ? (char_u *)buf_spname(curbuf)
+                           ? buf_spname(curbuf)
                            : curbuf->b_sfname == NULL
                                ? curbuf->b_fname
                                : curbuf->b_sfname,
@@ -1931,7 +1931,7 @@ prt_open_resource(struct prt_ps_resource_S *resource)
            break;
 
        case PRT_DSC_ENDCOMMENTS_TYPE:
-           // Wont find title or resource after this comment, stop searching
+           // Won't find title or resource after this comment, stop searching
            seen_all = TRUE;
            break;
 

diff --git a/src/if_cscope.c b/src/if_cscope.c
index 4e313cebc195871c72be52a1dc53ee93c4950f8d..7117a253f7794f018e329a42f33cabadf2c417a1 100644 (file)
--- a/src/if_cscope.c
+++ b/src/if_cscope.c
@@ -1253,7 +1253,7 @@ cs_find_common(
        int matched = 0;
 
        // read output
-       cs_fill_results((char *)pat, totmatches, nummatches, &matches,
+       cs_fill_results(pat, totmatches, nummatches, &matches,
                                                         &contexts, &matched);
        vim_free(nummatches);
        if (matches == NULL)
@@ -1745,7 +1745,7 @@ cs_parse_results(
      *
      * <filename> <context> <line number> <pattern>
      */
-    if ((name = strtok((char *)buf, (const char *)" ")) == NULL)
+    if ((name = strtok(buf, (const char *)" ")) == NULL)
        return NULL;
     if ((*context = strtok(NULL, (const char *)" ")) == NULL)
        return NULL;

diff --git a/src/move.c b/src/move.c
index ea86b88ea0b92f28a1a9f96ae0621c0eb1b939b5..9e3a714fd050c097fd9aaf8282be2cf2fa1ed881 100644 (file)
--- a/src/move.c
+++ b/src/move.c
@@ -1028,7 +1028,7 @@ curs_columns(
            // column
            sbr = get_showbreak_value(curwin);
            if (*sbr && *ml_get_cursor() == NUL
-                                   && curwin->w_wcol == (int)vim_strsize(sbr))
+                                   && curwin->w_wcol == vim_strsize(sbr))
                curwin->w_wcol = 0;
 #endif
        }

diff --git a/src/tag.c b/src/tag.c
index 2e57095ba5c44ef31ede9941aeb5731cfb339320..5fd81e3dc302fbb455412a1384d6386871c07f22 100644 (file)
--- a/src/tag.c
+++ b/src/tag.c
@@ -2802,7 +2802,7 @@ findtag_end:
                        if (*p == TAG_SEP)
                            *p = NUL;
                }
-               matches[match_count++] = (char_u *)mfp;
+               matches[match_count++] = mfp;
            }
        }
 

diff --git a/src/version.c b/src/version.c
index 843609541426e58f3532523c28273e6e7698e591..9331e3492eab6735deb83a912d69b6c5eb009a06 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -757,6 +757,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    3460,
 /**/
     3459,
 /**/
@@ -7746,7 +7748,7 @@ ex_version(exarg_T *eap)
     static void
 version_msg_wrap(char_u *s, int wrap)
 {
-    int                len = (int)vim_strsize(s) + (wrap ? 2 : 0);
+    int                len = vim_strsize(s) + (wrap ? 2 : 0);
 
     if (!got_int && len < (int)Columns && msg_col + len >= (int)Columns
                                                                && *s != '\n')
@@ -7798,7 +7800,7 @@ list_in_columns(char_u **items, int size, int current)
     // width.
     for (i = 0; size < 0 ? items[i] != NULL : i < size; ++i)
     {
-       int l = (int)vim_strsize(items[i]) + (i == current ? 2 : 0);
+       int l = vim_strsize(items[i]) + (i == current ? 2 : 0);
 
        if (l > width)
            width = l;