averello/vim-mirror
1
0
Fork 0
mirror of https://github.com/vim/vim.git synced 2026-05-28 00:21:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

patch 8.2.4043: using int for second argument of ga_init2()

Browse Source 
Problem:    Using int for second argument of ga_init2().
Solution:   Remove unnessary type cast (int) when using sizeof().
This commit is contained in:
Bram Moolenaar
2022-01-08 16:19:22 +00:00
parent 1433672568
commit 04935fb17e
36 changed files with 69 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/arglist.c
+2 -2
View File
@@ -51,7 +51,7 @@ alist_clear(alist_T *al)
void
alist_init(alist_T *al)
{
ga_init2(&al->al_ga, (int)sizeof(aentry_T), 5);
ga_init2(&al->al_ga, sizeof(aentry_T), 5);
}
/*
@@ -275,7 +275,7 @@ do_one_arg(char_u *str)
static int
get_arglist(garray_T *gap, char_u *str, int escaped)
{
ga_init2(gap, (int)sizeof(char_u *), 20);
ga_init2(gap, sizeof(char_u *), 20);
while (*str != NUL)
{
if (ga_grow(gap, 1) == FAIL)
src/channel.c
+1 -1
View File
@@ -2306,7 +2306,7 @@ channel_add_block_id(chanpart_T *chanpart, int id)
garray_T *gap = &chanpart->ch_block_ids;
if (gap->ga_growsize == 0)
ga_init2(gap, (int)sizeof(int), 10);
ga_init2(gap, sizeof(int), 10);
if (ga_grow(gap, 1) == OK)
{
((int *)gap->ga_data)[gap->ga_len] = id;
src/cmdexpand.c
+3 -3
View File
@@ -2342,7 +2342,7 @@ expand_shellcmd(
// Go over all directories in $PATH. Expand matches in that directory and
// collect them in "ga". When "." is not in $PATH also expand for the
// current directory, to find "subdir/cmd".
ga_init2(&ga, (int)sizeof(char *), 10);
ga_init2(&ga, sizeof(char *), 10);
hash_init(&found_ht);
for (s = path; ; s = e)
{
@@ -2497,7 +2497,7 @@ ExpandUserDefined(
if (retstr == NULL)
return FAIL;
ga_init2(&ga, (int)sizeof(char *), 3);
ga_init2(&ga, sizeof(char *), 3);
for (s = retstr; *s != NUL; s = e)
{
e = vim_strchr(s, '\n');
@@ -2543,7 +2543,7 @@ ExpandUserList(
if (retlist == NULL)
return FAIL;
ga_init2(&ga, (int)sizeof(char *), 3);
ga_init2(&ga, sizeof(char *), 3);
// Loop over the items in the list.
FOR_ALL_LIST_ITEMS(retlist, li)
{
src/dict.c
+1 -1
View File
@@ -759,7 +759,7 @@ dict2string(typval_T *tv, int copyID, int restore_copyID)
if ((d = tv->vval.v_dict) == NULL)
return NULL;
ga_init2(&ga, (int)sizeof(char), 80);
ga_init2(&ga, sizeof(char), 80);
ga_append(&ga, '{');
todo = (int)d->dv_hashtab.ht_used;
src/digraph.c
+1 -1
View File
@@ -2632,7 +2632,7 @@ ex_loadkeymap(exarg_T *eap)
keymap_unload();
curbuf->b_kmap_state = 0;
ga_init2(&curbuf->b_kmap_ga, (int)sizeof(kmap_T), 20);
ga_init2(&curbuf->b_kmap_ga, sizeof(kmap_T), 20);
// Set 'cpoptions' to "C" to avoid line continuation.
p_cpo = (char_u *)"C";
src/eval.c
+1 -1
View File
@@ -487,7 +487,7 @@ typval2string(typval_T *tv, int convert)
if (convert && tv->v_type == VAR_LIST)
{
ga_init2(&ga, (int)sizeof(char), 80);
ga_init2(&ga, sizeof(char), 80);
if (tv->vval.v_list != NULL)
{
list_join(&ga, tv->vval.v_list, (char_u *)"\n", TRUE, FALSE, 0);
src/evalfunc.c
+1 -1
View File
@@ -3662,7 +3662,7 @@ execute_common(typval_T *argvars, typval_T *rettv, int arg_off)
if (redir_execute)
save_ga = redir_execute_ga;
ga_init2(&redir_execute_ga, (int)sizeof(char), 500);
ga_init2(&redir_execute_ga, sizeof(char), 500);
redir_execute = TRUE;
redir_off = FALSE;
if (!echo_output)
src/evalvars.c
+1 -1
View File
@@ -4025,7 +4025,7 @@ clear_redir_lval(void)
void
init_redir_ga(void)
{
ga_init2(&redir_ga, (int)sizeof(char), 500);
ga_init2(&redir_ga, sizeof(char), 500);
}
/*
src/evalwindow.c
+1 -1
View File
@@ -1120,7 +1120,7 @@ f_winrestcmd(typval_T *argvars UNUSED, typval_T *rettv)
garray_T ga;
char_u buf[50];
ga_init2(&ga, (int)sizeof(char), 70);
ga_init2(&ga, sizeof(char), 70);
// Do this twice to handle some window layouts properly.
for (i = 0; i < 2; ++i)
src/ex_docmd.c
+1 -1
View File
@@ -691,7 +691,7 @@ do_cmdline(
#ifdef FEAT_EVAL
CLEAR_FIELD(cstack);
cstack.cs_idx = -1;
ga_init2(&lines_ga, (int)sizeof(wcmd_T), 10);
ga_init2(&lines_ga, sizeof(wcmd_T), 10);
real_cookie = getline_cookie(fgetline, cookie);
src/fileio.c
+1 -1
View File
@@ -4774,7 +4774,7 @@ readdir_core(
struct dirent *dp;
# endif
ga_init2(gap, (int)sizeof(void *), 20);
ga_init2(gap, sizeof(void *), 20);
# ifdef FEAT_EVAL
# define FREE_ITEM(item) do { \
src/filepath.c
+2 -2
View File
@@ -1388,7 +1388,7 @@ f_globpath(typval_T *argvars, typval_T *rettv)
}
if (file != NULL && !error)
{
ga_init2(&ga, (int)sizeof(char_u *), 10);
ga_init2(&ga, sizeof(char_u *), 10);
globpath(tv_get_string(&argvars[0]), file, &ga, flags);
if (rettv->v_type == VAR_STRING)
rettv->vval.v_string = ga_concat_strings(&ga, "\n");
@@ -3908,7 +3908,7 @@ gen_expand_wildcards(
/*
* The matching file names are stored in a growarray. Init it empty.
*/
ga_init2(&ga, (int)sizeof(char_u *), 30);
ga_init2(&ga, sizeof(char_u *), 30);
for (i = 0; i < num_pat; ++i)
{
src/findfile.c
+2 -2
View File
@@ -2430,7 +2430,7 @@ uniquefy_paths(garray_T *gap, char_u *pattern)
char_u *short_name;
remove_duplicates(gap);
ga_init2(&path_ga, (int)sizeof(char_u *), 1);
ga_init2(&path_ga, sizeof(char_u *), 1);
/*
* We need to prepend a '*' at the beginning of file_pattern so that the
@@ -2611,7 +2611,7 @@ expand_in_path(
return 0;
mch_dirname(curdir, MAXPATHL);
ga_init2(&path_ga, (int)sizeof(char_u *), 1);
ga_init2(&path_ga, sizeof(char_u *), 1);
expand_path_option(curdir, &path_ga);
vim_free(curdir);
if (path_ga.ga_len == 0)
src/fold.c
+3 -3
View File
@@ -647,7 +647,7 @@ foldCreate(linenr_T start, linenr_T end)
if (ga_grow(gap, 1) == OK)
{
fp = (fold_T *)gap->ga_data + i;
ga_init2(&fold_ga, (int)sizeof(fold_T), 10);
ga_init2(&fold_ga, sizeof(fold_T), 10);
// Count number of folds that will be contained in the new fold.
for (cont = 0; i + cont < gap->ga_len; ++cont)
@@ -1018,7 +1018,7 @@ foldMoveTo(
void
foldInitWin(win_T *new_win)
{
ga_init2(&new_win->w_folds, (int)sizeof(fold_T), 10);
ga_init2(&new_win->w_folds, sizeof(fold_T), 10);
}
// find_wl_entry() {{{2
@@ -2868,7 +2868,7 @@ foldInsert(garray_T *gap, int i)
if (gap->ga_len > 0 && i < gap->ga_len)
mch_memmove(fp + 1, fp, sizeof(fold_T) * (gap->ga_len - i));
++gap->ga_len;
ga_init2(&fp->fd_nested, (int)sizeof(fold_T), 10);
ga_init2(&fp->fd_nested, sizeof(fold_T), 10);
return OK;
}
src/hardcopy.c
+2 -2
View File
@@ -1650,7 +1650,7 @@ prt_flush_buffer(void)
prt_write_string("s\n");
ga_clear(&prt_ps_buffer);
ga_init2(&prt_ps_buffer, (int)sizeof(char), prt_bufsiz);
ga_init2(&prt_ps_buffer, sizeof(char), prt_bufsiz);
}
}
@@ -2649,7 +2649,7 @@ mch_print_init(
prt_bufsiz = psettings->chars_per_line;
if (prt_out_mbyte)
prt_bufsiz *= 2;
ga_init2(&prt_ps_buffer, (int)sizeof(char), prt_bufsiz);
ga_init2(&prt_ps_buffer, sizeof(char), prt_bufsiz);
prt_page_num = 0;
src/help.c
+1 -1
View File
@@ -999,7 +999,7 @@ helptags_one(
// If using the "++t" argument or generating tags for "$VIMRUNTIME/doc"
// add the "help-tags" tag.
ga_init2(&ga, (int)sizeof(char_u *), 100);
ga_init2(&ga, sizeof(char_u *), 100);
if (add_help_tags || fullpathcmp((char_u *)"$VIMRUNTIME/doc",
dir, FALSE, TRUE) == FPC_SAME)
{
src/if_py_both.h
+1 -1
View File
@@ -3264,7 +3264,7 @@ FunctionRepr(FunctionObject *self)
typval_T tv;
char_u numbuf[NUMBUFLEN];
ga_init2(&repr_ga, (int)sizeof(char), 70);
ga_init2(&repr_ga, sizeof(char), 70);
ga_concat(&repr_ga, (char_u *)"<vim.Function '");
if (self->name)
ga_concat(&repr_ga, self->name);
src/job.c
+2 -2
View File
@@ -1296,7 +1296,7 @@ job_start(
job->jv_status = JOB_FAILED;
#ifndef USE_ARGV
ga_init2(&ga, (int)sizeof(char*), 20);
ga_init2(&ga, sizeof(char*), 20);
#endif
if (opt_arg != NULL)
@@ -1435,7 +1435,7 @@ job_start(
{
garray_T ga;
ga_init2(&ga, (int)sizeof(char), 200);
ga_init2(&ga, sizeof(char), 200);
for (i = 0; i < argc; ++i)
{
if (i > 0)
src/list.c
+3 -3
View File
@@ -1299,7 +1299,7 @@ list2string(typval_T *tv, int copyID, int restore_copyID)
if (tv->vval.v_list == NULL)
return NULL;
ga_init2(&ga, (int)sizeof(char), 80);
ga_init2(&ga, sizeof(char), 80);
ga_append(&ga, '[');
CHECK_LIST_MATERIALIZE(tv->vval.v_list);
if (list_join(&ga, tv->vval.v_list, (char_u *)", ",
@@ -1412,7 +1412,7 @@ list_join(
if (l->lv_len < 1)
return OK; // nothing to do
ga_init2(&join_ga, (int)sizeof(join_T), l->lv_len);
ga_init2(&join_ga, sizeof(join_T), l->lv_len);
retval = list_join_inner(gap, l, sep, echo_style, restore_copyID,
copyID, &join_ga);
@@ -1461,7 +1461,7 @@ f_join(typval_T *argvars, typval_T *rettv)
if (sep != NULL)
{
ga_init2(&ga, (int)sizeof(char), 80);
ga_init2(&ga, sizeof(char), 80);
list_join(&ga, argvars[0].vval.v_list, sep, TRUE, FALSE, 0);
ga_append(&ga, NUL);
rettv->vval.v_string = (char_u *)ga.ga_data;
src/menu.c
+1 -1
View File
@@ -2664,7 +2664,7 @@ ex_menutranslate(exarg_T *eap UNUSED)
char_u *from, *from_noamp, *to;
if (menutrans_ga.ga_itemsize == 0)
ga_init2(&menutrans_ga, (int)sizeof(menutrans_T), 5);
ga_init2(&menutrans_ga, sizeof(menutrans_T), 5);
/*
* ":menutrans clear": clear all translations.
src/os_win32.c
+1 -1
View File
@@ -5280,7 +5280,7 @@ mch_job_start(char *cmd, job_T *job, jobopt_T *options)
ofd[1] = INVALID_HANDLE_VALUE;
efd[0] = INVALID_HANDLE_VALUE;
efd[1] = INVALID_HANDLE_VALUE;
ga_init2(&ga, (int)sizeof(wchar_t), 500);
ga_init2(&ga, sizeof(wchar_t), 500);
jo = CreateJobObject(NULL, NULL);
if (jo == NULL)
src/register.c
+1 -1
View File
@@ -527,7 +527,7 @@ execreg_line_continuation(char_u **lines, long *idx)
int j;
char_u *str;
ga_init2(&ga, (int)sizeof(char_u), 400);
ga_init2(&ga, sizeof(char_u), 400);
// search backwards to find the first line of this command.
// Any line not starting with \ or "\ is the start of the
src/scriptfile.c
+3 -3
View File
@@ -835,7 +835,7 @@ ExpandRTDir(
*num_file = 0;
*file = NULL;
pat_len = (int)STRLEN(pat);
ga_init2(&ga, (int)sizeof(char *), 10);
ga_init2(&ga, sizeof(char *), 10);
for (i = 0; dirnames[i] != NULL; ++i)
{
@@ -929,7 +929,7 @@ ExpandPackAddDir(
*num_file = 0;
*file = NULL;
pat_len = (int)STRLEN(pat);
ga_init2(&ga, (int)sizeof(char *), 10);
ga_init2(&ga, sizeof(char *), 10);
s = alloc(pat_len + 26);
if (s == NULL)
@@ -1833,7 +1833,7 @@ getsourceline(
{
garray_T ga;
ga_init2(&ga, (int)sizeof(char_u), 400);
ga_init2(&ga, sizeof(char_u), 400);
ga_concat(&ga, line);
if (*p == '\\')
ga_concat(&ga, p + 1);
src/spellfile.c
+6 -6
View File
@@ -5905,12 +5905,12 @@ mkspell(
spin.si_ascii = ascii;
spin.si_followup = TRUE;
spin.si_rem_accents = TRUE;
ga_init2(&spin.si_rep, (int)sizeof(fromto_T), 20);
ga_init2(&spin.si_repsal, (int)sizeof(fromto_T), 20);
ga_init2(&spin.si_sal, (int)sizeof(fromto_T), 20);
ga_init2(&spin.si_map, (int)sizeof(char_u), 100);
ga_init2(&spin.si_comppat, (int)sizeof(char_u *), 20);
ga_init2(&spin.si_prefcond, (int)sizeof(char_u *), 50);
ga_init2(&spin.si_rep, sizeof(fromto_T), 20);
ga_init2(&spin.si_repsal, sizeof(fromto_T), 20);
ga_init2(&spin.si_sal, sizeof(fromto_T), 20);
ga_init2(&spin.si_map, sizeof(char_u), 100);
ga_init2(&spin.si_comppat, sizeof(char_u *), 20);
ga_init2(&spin.si_prefcond, sizeof(char_u *), 50);
hash_init(&spin.si_commonwords);
spin.si_newcompID = 127; // start compound ID at first maximum
src/spellsuggest.c
+3 -3
View File
@@ -774,8 +774,8 @@ spell_find_suggest(
// Set the info in "*su".
CLEAR_POINTER(su);
ga_init2(&su->su_ga, (int)sizeof(suggest_T), 10);
ga_init2(&su->su_sga, (int)sizeof(suggest_T), 10);
ga_init2(&su->su_ga, sizeof(suggest_T), 10);
ga_init2(&su->su_sga, sizeof(suggest_T), 10);
if (*badptr == NUL)
return;
hash_init(&su->su_banned);
@@ -2943,7 +2943,7 @@ score_combine(suginfo_T *su)
check_suggestions(su, &su->su_sga);
(void)cleanup_suggestions(&su->su_sga, su->su_maxscore, su->su_maxcount);
ga_init2(&ga, (int)sizeof(suginfo_T), 1);
ga_init2(&ga, sizeof(suginfo_T), 1);
if (ga_grow(&ga, su->su_ga.ga_len + su->su_sga.ga_len) == FAIL)
return;
src/strings.c
+2 -2
View File
@@ -893,7 +893,7 @@ string_filter_map(
// set_vim_var_nr() doesn't set the type
set_vim_var_type(VV_KEY, VAR_NUMBER);
ga_init2(&ga, (int)sizeof(char), 80);
ga_init2(&ga, sizeof(char), 80);
for (p = str; *p != NUL; p += len)
{
typval_T newtv;
@@ -1673,7 +1673,7 @@ f_tr(typval_T *argvars, typval_T *rettv)
rettv->vval.v_string = NULL;
if (fromstr == NULL || tostr == NULL)
return; // type error; errmsg already given
ga_init2(&ga, (int)sizeof(char), 80);
ga_init2(&ga, sizeof(char), 80);
if (!has_mbyte)
// not multi-byte: fromstr and tostr must be the same length
src/syntax.c
+2 -2
View File
@@ -1414,7 +1414,7 @@ store_current_state(void)
{
// Need to clear it, might be something remaining from when the
// length was less than SST_FIX_STATES.
ga_init2(&sp->sst_union.sst_ga, (int)sizeof(bufstate_T), 1);
ga_init2(&sp->sst_union.sst_ga, sizeof(bufstate_T), 1);
if (ga_grow(&sp->sst_union.sst_ga, current_state.ga_len) == FAIL)
sp->sst_stacksize = 0;
else
@@ -1833,7 +1833,7 @@ syn_current_attr(
// Init the list of zero-width matches with a nextlist. This is used to
// avoid matching the same item in the same position twice.
ga_init2(&zero_width_next_ga, (int)sizeof(int), 10);
ga_init2(&zero_width_next_ga, sizeof(int), 10);
// use syntax iskeyword option
save_chartab(buf_chartab);
src/tag.c
+2 -2
View File
@@ -1752,7 +1752,7 @@ find_tags(
#endif
for (mtt = 0; mtt < MT_COUNT; ++mtt)
{
ga_init2(&ga_match[mtt], (int)sizeof(char_u *), 100);
ga_init2(&ga_match[mtt], sizeof(char_u *), 100);
hash_init(&ht_match[mtt]);
}
@@ -2952,7 +2952,7 @@ get_tagfname(
if (first)
{
ga_clear_strings(&tag_fnames);
ga_init2(&tag_fnames, (int)sizeof(char_u *), 10);
ga_init2(&tag_fnames, sizeof(char_u *), 10);
do_in_runtimepath((char_u *)
#ifdef FEAT_MULTI_LANG
# ifdef VMS
src/terminal.c
+4 -4
View File
@@ -6674,8 +6674,8 @@ conpty_term_and_job_init(
HANDLE i_ours = NULL;
HANDLE o_ours = NULL;
ga_init2(&ga_cmd, (int)sizeof(char*), 20);
ga_init2(&ga_env, (int)sizeof(char*), 20);
ga_init2(&ga_cmd, sizeof(char*), 20);
ga_init2(&ga_env, sizeof(char*), 20);
if (argvar->v_type == VAR_STRING)
{
@@ -7022,8 +7022,8 @@ winpty_term_and_job_init(
garray_T ga_cmd, ga_env;
char_u *cmd = NULL;
ga_init2(&ga_cmd, (int)sizeof(char*), 20);
ga_init2(&ga_env, (int)sizeof(char*), 20);
ga_init2(&ga_cmd, sizeof(char*), 20);
ga_init2(&ga_env, sizeof(char*), 20);
if (argvar->v_type == VAR_STRING)
{
src/undo.c
+1 -1
View File
@@ -3081,7 +3081,7 @@ ex_undolist(exarg_T *eap UNUSED)
*/
mark = ++lastmark;
nomark = ++lastmark;
ga_init2(&ga, (int)sizeof(char *), 20);
ga_init2(&ga, sizeof(char *), 20);
uhp = curbuf->b_u_oldhead;
while (uhp != NULL)
src/usercmd.c
+1 -1
View File
@@ -917,7 +917,7 @@ uc_add_command(
{
gap = &curbuf->b_ucmds;
if (gap->ga_itemsize == 0)
ga_init2(gap, (int)sizeof(ucmd_T), 4);
ga_init2(gap, sizeof(ucmd_T), 4);
}
else
gap = &ucmds;
src/userfunc.c
+7 -7
View File
@@ -222,11 +222,11 @@ get_function_args(
char_u *whitep = *argp;
if (newargs != NULL)
ga_init2(newargs, (int)sizeof(char_u *), 3);
ga_init2(newargs, sizeof(char_u *), 3);
if (argtypes != NULL)
ga_init2(argtypes, (int)sizeof(char_u *), 3);
ga_init2(argtypes, sizeof(char_u *), 3);
if (!skip && default_args != NULL)
ga_init2(default_args, (int)sizeof(char_u *), 3);
ga_init2(default_args, sizeof(char_u *), 3);
if (varargs != NULL)
*varargs = FALSE;
@@ -1149,7 +1149,7 @@ lambda_function_body(
eap.cookie = evalarg->eval_cookie;
}
ga_init2(&newlines, (int)sizeof(char_u *), 10);
ga_init2(&newlines, sizeof(char_u *), 10);
if (get_function_body(&eap, &newlines, NULL,
&evalarg->eval_tofree_ga) == FAIL)
goto erret;
@@ -1436,7 +1436,7 @@ get_lambda_tv(
if (pt == NULL)
goto errret;
ga_init2(&newlines, (int)sizeof(char_u *), 1);
ga_init2(&newlines, sizeof(char_u *), 1);
if (ga_grow(&newlines, 1) == FAIL)
goto errret;
@@ -1760,7 +1760,7 @@ get_func_tv(
// Prepare for calling test_garbagecollect_now(), need to know
// what variables are used on the call stack.
if (funcargs.ga_itemsize == 0)
ga_init2(&funcargs, (int)sizeof(typval_T *), 50);
ga_init2(&funcargs, sizeof(typval_T *), 50);
for (i = 0; i < argcount; ++i)
if (ga_grow(&funcargs, 1) == OK)
((typval_T **)funcargs.ga_data)[funcargs.ga_len++] =
@@ -4173,7 +4173,7 @@ define_function(exarg_T *eap, char_u *name_arg, garray_T *lines_to_free)
goto ret_free;
}
ga_init2(&newlines, (int)sizeof(char_u *), 10);
ga_init2(&newlines, sizeof(char_u *), 10);
if (!eap->skip && name_arg == NULL)
{
src/version.c
+2
View File
@@ -750,6 +750,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
4043,
/**/
4042,
/**/
src/vim9execute.c
+1 -1
View File
@@ -174,7 +174,7 @@ static garray_T dict_stack = GA_EMPTY;
dict_stack_save(typval_T *tv)
{
if (dict_stack.ga_growsize == 0)
ga_init2(&dict_stack, (int)sizeof(typval_T), 10);
ga_init2(&dict_stack, sizeof(typval_T), 10);
if (ga_grow(&dict_stack, 1) == FAIL)
return FAIL;
((typval_T *)dict_stack.ga_data)[dict_stack.ga_len] = *tv;
src/viminfo.c
+1 -1
View File
@@ -2912,7 +2912,7 @@ do_viminfo(FILE *fp_in, FILE *fp_out, int flags)
return;
vir.vir_fd = fp_in;
vir.vir_conv.vc_type = CONV_NONE;
ga_init2(&vir.vir_barlines, (int)sizeof(char_u *), 100);
ga_init2(&vir.vir_barlines, sizeof(char_u *), 100);
vir.vir_version = -1;
if (fp_in != NULL)
src/window.c
+1 -1
View File
@@ -5413,7 +5413,7 @@ win_size_save(garray_T *gap)
{
win_T *wp;
ga_init2(gap, (int)sizeof(int), 1);
ga_init2(gap, sizeof(int), 1);
if (ga_grow(gap, win_count() * 2 + 1) == OK)
{
// first entry is value of 'lines'