thac0/vim
1
0
Fork 0
forked from aniani/vim
Code

patch 8.2.4241: some type casts are redundant

Browse Source 
Problem:    Some type casts are redundant.
Solution:   Remove the type casts. (closes #9643)
This commit is contained in:
=?UTF-8?q?Dundar=20G=C3=B6c?= 2022-01-28 15:28:04 +00:00 committed by Bram Moolenaar
parent fb80862e49
commit 420fabcd4f
32 changed files with 92 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/blob.c
View File

@ -237,7 +237,7 @@ blob2string(blob_T *blob, char_u **tofree, char_u *numbuf)
{
if (i > 0 && (i & 3) == 0)
ga_concat(&ga, (char_u *)".");
vim_snprintf((char *)numbuf, NUMBUFLEN, "%02X", (int)blob_get(blob, i));
vim_snprintf((char *)numbuf, NUMBUFLEN, "%02X", blob_get(blob, i));
ga_concat(&ga, numbuf);
}
ga_append(&ga, NUL); // append a NUL at the end

4
src/buffer.c
View File

@ -1624,7 +1624,7 @@ do_bufdel(
// also be deleted, etc.
if (bnr == curbuf->b_fnum)
do_current = bnr;
else if (do_buffer_ext(command, DOBUF_FIRST, FORWARD, (int)bnr,
else if (do_buffer_ext(command, DOBUF_FIRST, FORWARD, bnr,
DOBUF_NOPOPUP | (forceit ? DOBUF_FORCEIT : 0)) == OK)
++deleted;
@ -3754,7 +3754,7 @@ fileinfo(
}
else
{
p = (char *)msg_trunc_attr(buffer, FALSE, 0);
p = msg_trunc_attr(buffer, FALSE, 0);
if (restart_edit != 0 || (msg_scrolled && !need_wait_return))
// Need to repeat the message after redrawing when:
// - When restart_edit is set (otherwise there will be a delay

2
src/channel.c
View File

@ -816,7 +816,7 @@ channel_connect(
ch_log(channel,
"Waiting for connection (waiting %d msec)...", waitnow);
ret = select((int)sd + 1, &rfds, &wfds, NULL, &tv);
ret = select(sd + 1, &rfds, &wfds, NULL, &tv);
if (ret < 0)
{
SOCK_ERRNO;

4
src/clientserver.c
View File

@ -34,7 +34,7 @@ server_to_input_buf(char_u *str)
// The last but one parameter of replace_termcodes() is TRUE so that the
// <lt> sequence is recognised - needed for a real backslash.
p_cpo = (char_u *)"Bk";
str = replace_termcodes((char_u *)str, &ptr, REPTERM_DO_LT, NULL);
str = replace_termcodes(str, &ptr, REPTERM_DO_LT, NULL);
p_cpo = cpo_save;
if (*ptr != NUL) // trailing CTRL-V results in nothing
@ -55,7 +55,7 @@ server_to_input_buf(char_u *str)
// buffer.
typebuf_was_filled = TRUE;
}
vim_free((char_u *)ptr);
vim_free(ptr);
}
/*

2
src/clipboard.c
View File

@ -1488,7 +1488,7 @@ clip_x11_convert_selection_cb(
// create NUL terminated string which XmbTextListToTextProperty wants
mch_memmove(string_nt, string, (size_t)*length);
string_nt[*length] = NUL;
conv_result = XmbTextListToTextProperty(X_DISPLAY, (char **)&string_nt,
conv_result = XmbTextListToTextProperty(X_DISPLAY, &string_nt,
1, XCompoundTextStyle, &text_prop);
if (conv_result != Success)
{

8
src/drawline.c
View File

@ -1357,7 +1357,7 @@ win_line(
#endif
)
{
screen_line(screen_row, wp->w_wincol, col, -(int)wp->w_width,
screen_line(screen_row, wp->w_wincol, col, -wp->w_width,
screen_line_flags);
// Pretend we have finished updating the window. Except when
// 'cursorcolumn' is set.
@ -2846,7 +2846,7 @@ win_line(
#endif
screen_line(screen_row, wp->w_wincol, col,
(int)wp->w_width, screen_line_flags);
wp->w_width, screen_line_flags);
row++;
// Update w_cline_height and w_cline_folded if the cursor line was
@ -3147,11 +3147,11 @@ win_line(
{
#ifdef FEAT_CONCEAL
screen_line(screen_row, wp->w_wincol, col - boguscols,
(int)wp->w_width, screen_line_flags);
wp->w_width, screen_line_flags);
boguscols = 0;
#else
screen_line(screen_row, wp->w_wincol, col,
(int)wp->w_width, screen_line_flags);
wp->w_width, screen_line_flags);
#endif
++row;
++screen_row;

10
src/drawscreen.c
View File

@ -538,7 +538,7 @@ win_redr_status(win_T *wp, int ignore_pum UNUSED)
this_ru_col + wp->w_wincol, fillchar, fillchar, attr);
if (get_keymap_str(wp, (char_u *)"<%s>", NameBuff, MAXPATHL)
&& (int)(this_ru_col - len) > (int)(STRLEN(NameBuff) + 1))
&& (this_ru_col - len) > (int)(STRLEN(NameBuff) + 1))
screen_puts(NameBuff, row, (int)(this_ru_col - STRLEN(NameBuff)
- 1 + wp->w_wincol), attr);
@ -797,7 +797,7 @@ win_redr_ruler(win_T *wp, int always, int ignore_pum)
i = redraw_cmdline;
screen_fill(row, row + 1,
this_ru_col + off + (int)STRLEN(buffer),
(int)(off + width),
(off + width),
fillchar, fillchar, attr);
// don't redraw the cmdline because of showing the ruler
redraw_cmdline = i;
@ -1038,8 +1038,7 @@ redraw_win_toolbar(win_T *wp)
}
wp->w_winbar_items[item_idx].wb_menu = NULL; // end marker
screen_line(wp->w_winrow, wp->w_wincol, (int)wp->w_width,
(int)wp->w_width, 0);
screen_line(wp->w_winrow, wp->w_wincol, wp->w_width, wp->w_width, 0);
}
#endif
@ -1372,8 +1371,7 @@ fold_line(
}
#endif
screen_line(row + W_WINROW(wp), wp->w_wincol, (int)wp->w_width,
(int)wp->w_width, 0);
screen_line(row + W_WINROW(wp), wp->w_wincol, wp->w_width, wp->w_width, 0);
// Update w_cline_height and w_cline_folded if the cursor line was
// updated (saves a call to plines() later).

6
src/edit.c
View File

@ -523,7 +523,7 @@ edit(
if (
#ifdef FEAT_VARTABS
(int)curwin->w_wcol < mincol - tabstop_at(
curwin->w_wcol < mincol - tabstop_at(
get_nolist_virtcol(), curbuf->b_p_ts,
curbuf->b_p_vts_array)
#else
@ -2134,7 +2134,7 @@ insertchar(
return;
// Check whether this character should end a comment.
if (did_ai && (int)c == end_comment_pending)
if (did_ai && c == end_comment_pending)
{
char_u *line;
char_u lead_end[COM_MAX_LEN]; // end-comment string
@ -2907,7 +2907,7 @@ stuff_inserted(
// may want to stuff the command character, to start Insert mode
if (c != NUL)
stuffcharReadbuff(c);
if ((esc_ptr = (char_u *)vim_strrchr(ptr, ESC)) != NULL)
if ((esc_ptr = vim_strrchr(ptr, ESC)) != NULL)
*esc_ptr = NUL; // remove the ESC
// when the last char is either "0" or "^" it will be quoted if no ESC

8
src/evalfunc.c
View File

@ -7158,7 +7158,7 @@ find_some_match(typval_T *argvars, typval_T *rettv, matchtype_T type)
break;
}
match = vim_regexec_nl(&regmatch, str, (colnr_T)startcol);
match = vim_regexec_nl(&regmatch, str, startcol);
if (match && --nth <= 0)
break;
@ -7944,7 +7944,7 @@ range_list_materialize(list_T *list)
list->lv_u.mat.lv_idx_item = NULL;
for (i = start; stride > 0 ? i <= end : i >= end; i += stride)
{
if (list_append_number(list, (varnumber_T)i) == FAIL)
if (list_append_number(list, i) == FAIL)
break;
if (list->lv_lock & VAR_ITEMS_LOCKED)
list->lv_u.mat.lv_last->li_tv.v_lock = VAR_LOCKED;
@ -9804,7 +9804,7 @@ f_synID(typval_T *argvars UNUSED, typval_T *rettv)
if (!transerr && lnum >= 1 && lnum <= curbuf->b_ml.ml_line_count
&& col >= 0 && col < (long)STRLEN(ml_get(lnum)))
id = syn_get_id(curwin, lnum, (colnr_T)col, trans, NULL, FALSE);
id = syn_get_id(curwin, lnum, col, trans, NULL, FALSE);
#endif
rettv->vval.v_number = id;
@ -10024,7 +10024,7 @@ f_synstack(typval_T *argvars UNUSED, typval_T *rettv)
&& col >= 0 && col <= (long)STRLEN(ml_get(lnum))
&& rettv_list_alloc(rettv) != FAIL)
{
(void)syn_get_id(curwin, lnum, (colnr_T)col, FALSE, NULL, TRUE);
(void)syn_get_id(curwin, lnum, col, FALSE, NULL, TRUE);
for (i = 0; ; ++i)
{
id = syn_get_stack_item(i);

2
src/ex_cmds.c
View File

@ -1185,7 +1185,7 @@ do_filter(
if (do_out)
{
if (u_save((linenr_T)(line2), (linenr_T)(line2 + 1)) == FAIL)
if (u_save(line2, (linenr_T)(line2 + 1)) == FAIL)
{
vim_free(cmd_buf);
goto error;

6
src/ex_docmd.c
View File

@ -6800,7 +6800,7 @@ ex_resize(exarg_T *eap)
n += wp->w_width;
else if (n == 0 && eap->arg[0] == NUL) // default is very wide
n = 9999;
win_setwidth_win((int)n, wp);
win_setwidth_win(n, wp);
}
else
{
@ -6808,7 +6808,7 @@ ex_resize(exarg_T *eap)
n += wp->w_height;
else if (n == 0 && eap->arg[0] == NUL) // default is very high
n = 9999;
win_setheight_win((int)n, wp);
win_setheight_win(n, wp);
}
}
@ -7531,7 +7531,7 @@ ex_sleep(exarg_T *eap)
{
n = W_WINROW(curwin) + curwin->w_wrow - msg_scrolled;
if (n >= 0)
windgoto((int)n, curwin->w_wincol + curwin->w_wcol);
windgoto(n, curwin->w_wincol + curwin->w_wcol);
}
len = eap->line2;

2
src/ex_eval.c
View File

@ -2283,7 +2283,7 @@ leave_cleanup(cleanup_T *csp)
{
if (pending & CSTP_THROW)
// Cancel the pending exception (includes report).
discard_exception((except_T *)csp->exception, FALSE);
discard_exception(csp->exception, FALSE);
else
report_discard_pending(pending, NULL);

2
src/fold.c
View File

@ -2637,7 +2637,7 @@ foldUpdateIEMSRecurse(
// to stop just above startlnum.
fp->fd_len = startlnum - fp->fd_top;
foldMarkAdjustRecurse(&fp->fd_nested,
(linenr_T)fp->fd_len, (linenr_T)MAXLNUM,
fp->fd_len, (linenr_T)MAXLNUM,
(linenr_T)MAXLNUM, 0L);
fold_changed = TRUE;
}

2
src/if_cscope.c
View File

@ -916,7 +916,7 @@ err_closing:
goto err_closing;
#endif
}
expand_env((char_u *)p_csprg, (char_u *)prog, MAXPATHL);
expand_env(p_csprg, (char_u *)prog, MAXPATHL);
// alloc space to hold the cscope command
len = (int)(strlen(prog) + strlen(csinfo[i].fname) + 32);

2
src/json.c
View File

@ -244,7 +244,7 @@ json_encode_item(garray_T *gap, typval_T *val, int copyID, int options)
if (i > 0)
ga_concat(gap, (char_u *)",");
vim_snprintf((char *)numbuf, NUMBUFLEN, "%d",
(int)blob_get(b, i));
blob_get(b, i));
ga_concat(gap, numbuf);
}
ga_append(gap, ']');

4
src/match.c
View File

@ -1036,7 +1036,7 @@ f_getmatches(typval_T *argvars UNUSED, typval_T *rettv UNUSED)
{
char_u buf[MB_MAXBYTES + 1];
buf[(*mb_char2bytes)((int)cur->conceal_char, buf)] = NUL;
buf[(*mb_char2bytes)(cur->conceal_char, buf)] = NUL;
dict_add_string(dict, "conceal", (char_u *)&buf);
}
# endif
@ -1309,7 +1309,7 @@ f_matcharg(typval_T *argvars UNUSED, typval_T *rettv)
id = (int)tv_get_number(&argvars[0]);
if (id >= 1 && id <= 3)
{
if ((m = (matchitem_T *)get_match(curwin, id)) != NULL)
if ((m = get_match(curwin, id)) != NULL)
{
list_append_string(rettv->vval.v_list,
syn_id2name(m->hlg_id), -1);

6
src/memline.c
View File

@ -551,7 +551,7 @@ ml_set_crypt_key(
mf_put(mfp, hp, FALSE, FALSE); // release previous block
// get the block (pointer or data)
if ((hp = mf_get(mfp, (blocknr_T)bnum, page_count)) == NULL)
if ((hp = mf_get(mfp, bnum, page_count)) == NULL)
{
if (bnum == 1)
break;
@ -1511,7 +1511,7 @@ ml_recover(int checkext)
/*
* get block
*/
if ((hp = mf_get(mfp, (blocknr_T)bnum, page_count)) == NULL)
if ((hp = mf_get(mfp, bnum, page_count)) == NULL)
{
if (bnum == 1)
{
@ -3672,7 +3672,7 @@ ml_delete_int(buf_T *buf, linenr_T lnum, int flags)
#ifdef FEAT_NETBEANS_INTG
if (netbeans_active())
netbeans_removed(buf, lnum, 0, (long)line_size);
netbeans_removed(buf, lnum, 0, line_size);
#endif
#ifdef FEAT_PROP_POPUP
// If there are text properties, make a copy, so that we can update

6
src/message.c
View File

@ -164,7 +164,7 @@ msg_attr_keep(
#ifdef FEAT_JOB_CHANNEL
if (emsg_to_channel_log)
// Write message in the channel log.
ch_log(NULL, "ERROR: %s", (char *)s);
ch_log(NULL, "ERROR: %s", s);
#endif
// Truncate the message if needed.
@ -905,7 +905,7 @@ emsg_invreg(int name)
void
emsg_namelen(char *msg, char_u *name, int len)
{
char_u *copy = vim_strnsave((char_u *)name, len);
char_u *copy = vim_strnsave(name, len);
semsg(msg, copy == NULL ? "NULL" : (char *)copy);
vim_free(copy);
@ -3701,7 +3701,7 @@ give_warning2(char_u *message, char_u *a1, int hl)
{
// Very early in initialisation and already something wrong, just give
// the raw message so the user at least gets a hint.
give_warning((char_u *)message, hl);
give_warning(message, hl);
}
else
{

2
src/misc1.c
View File

@ -379,7 +379,7 @@ plines_win_nofill(
lines = plines_win_nofold(wp, lnum);
if (winheight > 0 && lines > wp->w_height)
return (int)wp->w_height;
return wp->w_height;
return lines;
}

2
src/normal.c
View File

@ -5211,7 +5211,7 @@ nv_replace(cmdarg_T *cap)
colnr_T start = (colnr_T)(curwin->w_cursor.col - cap->count1);
netbeans_removed(curbuf, curwin->w_cursor.lnum, start,
(long)cap->count1);
cap->count1);
netbeans_inserted(curbuf, curwin->w_cursor.lnum, start,
&ptr[start], (int)cap->count1);
}

51
src/ops.c
View File

@ -334,8 +334,7 @@ shift_block(oparg_T *oap, int amount)
for ( ; VIM_ISWHITE(*bd.textstart); )
{
// TODO: is passing bd.textstart for start of the line OK?
incr = lbr_chartabsize_adv(bd.textstart, &bd.textstart,
(colnr_T)(bd.start_vcol));
incr = lbr_chartabsize_adv(bd.textstart, &bd.textstart, bd.start_vcol);
total += incr;
bd.start_vcol += incr;
}
@ -460,7 +459,7 @@ shift_block(oparg_T *oap, int amount)
}
// replace the line
ml_replace(curwin->w_cursor.lnum, newp, FALSE);
changed_bytes(curwin->w_cursor.lnum, (colnr_T)bd.textcol);
changed_bytes(curwin->w_cursor.lnum, bd.textcol);
State = oldstate;
curwin->w_cursor.col = oldcol;
#ifdef FEAT_RIGHTLEFT
@ -2133,7 +2132,7 @@ do_join(
// what is added if it is inside these spaces.
spaces_removed = (curr - curr_start) - spaces[t];
mark_col_adjust(curwin->w_cursor.lnum + t, (colnr_T)0, (linenr_T)-t,
mark_col_adjust(curwin->w_cursor.lnum + t, (colnr_T)0, -t,
(long)(cend - newp - spaces_removed), spaces_removed);
#ifdef FEAT_PROP_POPUP
prepend_joined_props(newp + sumsize + 1, propcount, &props_remaining,
@ -2243,7 +2242,7 @@ block_prep(
while (bdp->start_vcol < oap->start_vcol && *pstart)
{
// Count a tab for what it's worth (if list mode not on)
incr = lbr_chartabsize(line, pstart, (colnr_T)bdp->start_vcol);
incr = lbr_chartabsize(line, pstart, bdp->start_vcol);
bdp->start_vcol += incr;
if (VIM_ISWHITE(*pstart))
{
@ -2306,7 +2305,7 @@ block_prep(
{
// Count a tab for what it's worth (if list mode not on)
prev_pend = pend;
incr = lbr_chartabsize_adv(line, &pend, (colnr_T)bdp->end_vcol);
incr = lbr_chartabsize_adv(line, &pend, bdp->end_vcol);
bdp->end_vcol += incr;
}
if (bdp->end_vcol <= oap->end_vcol
@ -2866,13 +2865,13 @@ do_addsub(
buf2[i] = '\0';
}
else if (pre == 0)
vim_snprintf((char *)buf2, NUMBUFLEN, "%llu", (uvarnumber_T)n);
vim_snprintf((char *)buf2, NUMBUFLEN, "%llu", n);
else if (pre == '0')
vim_snprintf((char *)buf2, NUMBUFLEN, "%llo", (uvarnumber_T)n);
vim_snprintf((char *)buf2, NUMBUFLEN, "%llo", n);
else if (pre && hexupper)
vim_snprintf((char *)buf2, NUMBUFLEN, "%llX", (uvarnumber_T)n);
vim_snprintf((char *)buf2, NUMBUFLEN, "%llX", n);
else
vim_snprintf((char *)buf2, NUMBUFLEN, "%llx", (uvarnumber_T)n);
vim_snprintf((char *)buf2, NUMBUFLEN, "%llx", n);
length -= (int)STRLEN(buf2);
/*
@ -3191,21 +3190,21 @@ cursor_pos_info(dict_T *dict)
_("Selected %s%ld of %ld Lines; %lld of %lld Words; %lld of %lld Bytes"),
buf1, line_count_selected,
(long)curbuf->b_ml.ml_line_count,
(varnumber_T)word_count_cursor,
(varnumber_T)word_count,
(varnumber_T)byte_count_cursor,
(varnumber_T)byte_count);
word_count_cursor,
word_count,
byte_count_cursor,
byte_count);
else
vim_snprintf((char *)IObuff, IOSIZE,
_("Selected %s%ld of %ld Lines; %lld of %lld Words; %lld of %lld Chars; %lld of %lld Bytes"),
buf1, line_count_selected,
(long)curbuf->b_ml.ml_line_count,
(varnumber_T)word_count_cursor,
(varnumber_T)word_count,
(varnumber_T)char_count_cursor,
(varnumber_T)char_count,
(varnumber_T)byte_count_cursor,
(varnumber_T)byte_count);
word_count_cursor,
word_count,
char_count_cursor,
char_count,
byte_count_cursor,
byte_count);
}
else
{
@ -3223,17 +3222,17 @@ cursor_pos_info(dict_T *dict)
(char *)buf1, (char *)buf2,
(long)curwin->w_cursor.lnum,
(long)curbuf->b_ml.ml_line_count,
(varnumber_T)word_count_cursor, (varnumber_T)word_count,
(varnumber_T)byte_count_cursor, (varnumber_T)byte_count);
word_count_cursor, word_count,
byte_count_cursor, byte_count);
else
vim_snprintf((char *)IObuff, IOSIZE,
_("Col %s of %s; Line %ld of %ld; Word %lld of %lld; Char %lld of %lld; Byte %lld of %lld"),
(char *)buf1, (char *)buf2,
(long)curwin->w_cursor.lnum,
(long)curbuf->b_ml.ml_line_count,
(varnumber_T)word_count_cursor, (varnumber_T)word_count,
(varnumber_T)char_count_cursor, (varnumber_T)char_count,
(varnumber_T)byte_count_cursor, (varnumber_T)byte_count);
word_count_cursor, word_count,
char_count_cursor, char_count,
byte_count_cursor, byte_count);
}
}
@ -3243,7 +3242,7 @@ cursor_pos_info(dict_T *dict)
size_t len = STRLEN(IObuff);
vim_snprintf((char *)IObuff + len, IOSIZE - len,
_("(+%lld for BOM)"), (varnumber_T)bom_count);
_("(+%lld for BOM)"), bom_count);
}
if (dict == NULL)
{

4
src/option.c
View File

@ -3702,7 +3702,7 @@ set_num_option(
{
if (errbuf != NULL)
{
vim_snprintf((char *)errbuf, errbuflen,
vim_snprintf(errbuf, errbuflen,
_(e_need_at_least_nr_lines), min_rows());
errmsg = errbuf;
}
@ -3712,7 +3712,7 @@ set_num_option(
{
if (errbuf != NULL)
{
vim_snprintf((char *)errbuf, errbuflen,
vim_snprintf(errbuf, errbuflen,
_(e_need_at_least_nr_columns), MIN_COLUMNS);
errmsg = errbuf;
}

2
src/optionstr.c
View File

@ -181,7 +181,7 @@ trigger_optionsset_string(
set_vim_var_string(VV_OPTION_OLDLOCAL, oldval, -1);
}
apply_autocmds(EVENT_OPTIONSET,
(char_u *)get_option_fullname(opt_idx), NULL, FALSE,
get_option_fullname(opt_idx), NULL, FALSE,
NULL);
reset_v_option_vars();
}

8
src/os_unix.c
View File

@ -5666,7 +5666,7 @@ mch_job_start(char **argv, job_T *job, jobopt_T *options, int is_terminal)
{
typval_T *item = &dict_lookup(hi)->di_tv;
vim_setenv((char_u*)hi->hi_key, tv_get_string(item));
vim_setenv(hi->hi_key, tv_get_string(item));
--todo;
}
}
@ -7487,7 +7487,7 @@ mch_libcall(
if (hinstLib == NULL)
{
// "dlerr" must be used before dlclose()
dlerr = (char *)dlerror();
dlerr = dlerror();
if (dlerr != NULL)
semsg(_("dlerror = \"%s\""), dlerr);
}
@ -7522,7 +7522,7 @@ mch_libcall(
{
# if defined(USE_DLOPEN)
*(void **)(&ProcAdd) = dlsym(hinstLib, (const char *)funcname);
dlerr = (char *)dlerror();
dlerr = dlerror();
# else
if (shl_findsym(&hinstLib, (const char *)funcname,
TYPE_PROCEDURE, (void *)&ProcAdd) < 0)
@ -7544,7 +7544,7 @@ mch_libcall(
{
# if defined(USE_DLOPEN)
*(void **)(&ProcAddI) = dlsym(hinstLib, (const char *)funcname);
dlerr = (char *)dlerror();
dlerr = dlerror();
# else
if (shl_findsym(&hinstLib, (const char *)funcname,
TYPE_PROCEDURE, (void *)&ProcAddI) < 0)

2
src/register.c
View File

@ -1842,7 +1842,7 @@ do_put(
for (ptr = oldp; vcol < col && *ptr; )
{
// Count a tab for what it's worth (if list mode not on)
incr = lbr_chartabsize_adv(oldp, &ptr, (colnr_T)vcol);
incr = lbr_chartabsize_adv(oldp, &ptr, vcol);
vcol += incr;
}
bd.textcol = (colnr_T)(ptr - oldp);

14
src/sign.c
View File

@ -1745,38 +1745,38 @@ sign_getinfo(sign_T *sp, dict_T *retdict)
{
char_u *p;
dict_add_string(retdict, "name", (char_u *)sp->sn_name);
dict_add_string(retdict, "name", sp->sn_name);
if (sp->sn_icon != NULL)
dict_add_string(retdict, "icon", (char_u *)sp->sn_icon);
dict_add_string(retdict, "icon", sp->sn_icon);
if (sp->sn_text != NULL)
dict_add_string(retdict, "text", (char_u *)sp->sn_text);
dict_add_string(retdict, "text", sp->sn_text);
if (sp->sn_line_hl > 0)
{
p = get_highlight_name_ext(NULL, sp->sn_line_hl - 1, FALSE);
if (p == NULL)
p = (char_u *)"NONE";
dict_add_string(retdict, "linehl", (char_u *)p);
dict_add_string(retdict, "linehl", p);
}
if (sp->sn_text_hl > 0)
{
p = get_highlight_name_ext(NULL, sp->sn_text_hl - 1, FALSE);
if (p == NULL)
p = (char_u *)"NONE";
dict_add_string(retdict, "texthl", (char_u *)p);
dict_add_string(retdict, "texthl", p);
}
if (sp->sn_cul_hl > 0)
{
p = get_highlight_name_ext(NULL, sp->sn_cul_hl - 1, FALSE);
if (p == NULL)
p = (char_u *)"NONE";
dict_add_string(retdict, "culhl", (char_u *)p);
dict_add_string(retdict, "culhl", p);
}
if (sp->sn_num_hl > 0)
{
p = get_highlight_name_ext(NULL, sp->sn_num_hl - 1, FALSE);
if (p == NULL)
p = (char_u *)"NONE";
dict_add_string(retdict, "numhl", (char_u *)p);
dict_add_string(retdict, "numhl", p);
}
}

2
src/spellfile.c
View File

@ -3618,7 +3618,7 @@ spell_read_dic(spellinfo_T *spin, char_u *fname, afffile_T *affile)
}
// Store the word in the hashtable to be able to find duplicates.
dw = (char_u *)getroom_save(spin, w);
dw = getroom_save(spin, w);
if (dw == NULL)
{
retval = FAIL;

2
src/tag.c
View File

@ -3799,7 +3799,7 @@ expand_tag_fname(char_u *fname, char_u *tag_fname, int expand)
{
ExpandInit(&xpc);
xpc.xp_context = EXPAND_FILES;
expanded_fname = ExpandOne(&xpc, (char_u *)fname, NULL,
expanded_fname = ExpandOne(&xpc, fname, NULL,
WILD_LIST_NOTFOUND|WILD_SILENT, WILD_EXPAND_FREE);
if (expanded_fname != NULL)
fname = expanded_fname;

8
src/ui.c
View File

@ -1106,8 +1106,8 @@ check_col(int col)
{
if (col < 0)
return 0;
if (col >= (int)screen_Columns)
return (int)screen_Columns - 1;
if (col >= screen_Columns)
return screen_Columns - 1;
return col;
}
@ -1119,8 +1119,8 @@ check_row(int row)
{
if (row < 0)
return 0;
if (row >= (int)screen_Rows)
return (int)screen_Rows - 1;
if (row >= screen_Rows)
return screen_Rows - 1;
return row;
}

6
src/undo.c
View File

@ -1142,7 +1142,7 @@ undo_read(bufinfo_T *bi, char_u *buffer, size_t size)
}
else
#endif
if (fread(buffer, (size_t)size, 1, bi->bi_fp) != 1)
if (fread(buffer, size, 1, bi->bi_fp) != 1)
retval = FAIL;
if (retval == FAIL)
@ -3710,10 +3710,10 @@ f_undotree(typval_T *argvars UNUSED, typval_T *rettv)
dict_add_number(dict, "synced", (long)curbuf->b_u_synced);
dict_add_number(dict, "seq_last", curbuf->b_u_seq_last);
dict_add_number(dict, "save_last", (long)curbuf->b_u_save_nr_last);
dict_add_number(dict, "save_last", curbuf->b_u_save_nr_last);
dict_add_number(dict, "seq_cur", curbuf->b_u_seq_cur);
dict_add_number(dict, "time_cur", (long)curbuf->b_u_time_cur);
dict_add_number(dict, "save_cur", (long)curbuf->b_u_save_nr_cur);
dict_add_number(dict, "save_cur", curbuf->b_u_save_nr_cur);
list = list_alloc();
if (list != NULL)

2
src/version.c
View File

@ -750,6 +750,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
4241,
/**/
4240,
/**/

2
src/window.c
View File

@ -6493,7 +6493,7 @@ command_height(void)
// clear the lines added to cmdline
if (full_screen)
screen_fill((int)(cmdline_row), (int)Rows, 0,
screen_fill(cmdline_row, (int)Rows, 0,
(int)Columns, ' ', ' ', 0);
msg_row = cmdline_row;
redraw_cmdline = TRUE;