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 a721e70..bd1ed87 100644
--- a/src/autocmd.c
+++ b/src/autocmd.c
@@ -386,7 +386,7 @@
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 @@
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 @@
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 @@
{
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 @@
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 507eb01..5616487 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -103,7 +103,7 @@
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 ec948eb..e21dd22 100644
--- a/src/debugger.c
+++ b/src/debugger.c
@@ -440,7 +440,7 @@
// 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 52c7721..2d31c03 100644
--- a/src/getchar.c
+++ b/src/getchar.c
@@ -1853,7 +1853,7 @@
// 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 @@
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 @@
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 069fa43..a04d5d8 100644
--- a/src/hardcopy.c
+++ b/src/hardcopy.c
@@ -588,7 +588,7 @@
*/
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 @@
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 4e313ce..7117a25 100644
--- a/src/if_cscope.c
+++ b/src/if_cscope.c
@@ -1253,7 +1253,7 @@
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 @@
*
* <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 ea86b88..9e3a714 100644
--- a/src/move.c
+++ b/src/move.c
@@ -1028,7 +1028,7 @@
// 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 2e57095..5fd81e3 100644
--- a/src/tag.c
+++ b/src/tag.c
@@ -2802,7 +2802,7 @@
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 8436095..9331e34 100644
--- a/src/version.c
+++ b/src/version.c
@@ -758,6 +758,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 3460,
+/**/
3459,
/**/
3458,
@@ -7746,7 +7748,7 @@
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 @@
// 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;