mirror of
https://github.com/vim/vim.git
synced 2025-07-26 11:04:33 -04:00
patch 8.1.1393: unnecessary type casts
Problem: Unnecessary type casts. Solution: Remove type casts from alloc() and lalloc() calls. (Mike Williams)
This commit is contained in:
parent
682725c141
commit
51e14387f1
@ -1354,7 +1354,7 @@ channel_set_req_callback(
|
|||||||
int id)
|
int id)
|
||||||
{
|
{
|
||||||
cbq_T *head = &channel->ch_part[part].ch_cb_head;
|
cbq_T *head = &channel->ch_part[part].ch_cb_head;
|
||||||
cbq_T *item = (cbq_T *)alloc((int)sizeof(cbq_T));
|
cbq_T *item = (cbq_T *)alloc(sizeof(cbq_T));
|
||||||
|
|
||||||
if (item != NULL)
|
if (item != NULL)
|
||||||
{
|
{
|
||||||
@ -3921,7 +3921,7 @@ channel_send(
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
writeq_T *last = (writeq_T *)alloc((int)sizeof(writeq_T));
|
writeq_T *last = (writeq_T *)alloc(sizeof(writeq_T));
|
||||||
|
|
||||||
if (last != NULL)
|
if (last != NULL)
|
||||||
{
|
{
|
||||||
|
@ -254,7 +254,7 @@ crypt_create(
|
|||||||
char_u *seed,
|
char_u *seed,
|
||||||
int seed_len)
|
int seed_len)
|
||||||
{
|
{
|
||||||
cryptstate_T *state = (cryptstate_T *)alloc((int)sizeof(cryptstate_T));
|
cryptstate_T *state = (cryptstate_T *)alloc(sizeof(cryptstate_T));
|
||||||
|
|
||||||
if (state == NULL)
|
if (state == NULL)
|
||||||
return state;
|
return state;
|
||||||
@ -407,7 +407,7 @@ crypt_encode_alloc(
|
|||||||
/* Not buffering, just return EOF. */
|
/* Not buffering, just return EOF. */
|
||||||
return (long)len;
|
return (long)len;
|
||||||
|
|
||||||
*newptr = alloc((long)len);
|
*newptr = alloc(len);
|
||||||
if (*newptr == NULL)
|
if (*newptr == NULL)
|
||||||
return -1;
|
return -1;
|
||||||
method->encode_fn(state, from, len, *newptr);
|
method->encode_fn(state, from, len, *newptr);
|
||||||
|
@ -54,7 +54,7 @@ dict_alloc(void)
|
|||||||
dict_alloc_id(alloc_id_T id UNUSED)
|
dict_alloc_id(alloc_id_T id UNUSED)
|
||||||
{
|
{
|
||||||
#ifdef FEAT_EVAL
|
#ifdef FEAT_EVAL
|
||||||
if (alloc_fail_id == id && alloc_does_fail((long_u)sizeof(list_T)))
|
if (alloc_fail_id == id && alloc_does_fail(sizeof(list_T)))
|
||||||
return NULL;
|
return NULL;
|
||||||
#endif
|
#endif
|
||||||
return (dict_alloc());
|
return (dict_alloc());
|
||||||
|
@ -306,7 +306,7 @@ findoldfile(char **destination)
|
|||||||
|| strchr(cp, '/') != NULL)
|
|| strchr(cp, '/') != NULL)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
tmpname = alloc((int)strlen(cp) + 1);
|
tmpname = alloc(strlen(cp) + 1);
|
||||||
strcpy(tmpname, cp);
|
strcpy(tmpname, cp);
|
||||||
tmpname[strlen(tmpname) - 1] = 'x'; /* .exe -> .exx */
|
tmpname[strlen(tmpname) - 1] = 'x'; /* .exe -> .exx */
|
||||||
|
|
||||||
@ -962,7 +962,7 @@ alloc_text(int idx, char *fmt, char *arg)
|
|||||||
if (choices[idx].text != NULL)
|
if (choices[idx].text != NULL)
|
||||||
free(choices[idx].text);
|
free(choices[idx].text);
|
||||||
|
|
||||||
choices[idx].text = alloc((int)(strlen(fmt) + strlen(arg)) - 1);
|
choices[idx].text = alloc(strlen(fmt) + strlen(arg) - 1);
|
||||||
sprintf(choices[idx].text, fmt, arg);
|
sprintf(choices[idx].text, fmt, arg);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1040,7 +1040,7 @@ change_bat_choice(int idx)
|
|||||||
s = p + strlen(p);
|
s = p + strlen(p);
|
||||||
if (names != NULL)
|
if (names != NULL)
|
||||||
{
|
{
|
||||||
names[count] = alloc((int)(s - p) + 1);
|
names[count] = alloc(s - p + 1);
|
||||||
strncpy(names[count], p, s - p);
|
strncpy(names[count], p, s - p);
|
||||||
names[count][s - p] = NUL;
|
names[count][s - p] = NUL;
|
||||||
}
|
}
|
||||||
@ -1051,7 +1051,7 @@ change_bat_choice(int idx)
|
|||||||
}
|
}
|
||||||
if (names != NULL)
|
if (names != NULL)
|
||||||
break;
|
break;
|
||||||
names = alloc((int)(count + 1) * sizeof(char *));
|
names = alloc((count + 1) * sizeof(char *));
|
||||||
}
|
}
|
||||||
names[0] = alloc(50);
|
names[0] = alloc(50);
|
||||||
sprintf(names[0], "Select directory to create %s in:", name);
|
sprintf(names[0], "Select directory to create %s in:", name);
|
||||||
|
@ -4412,7 +4412,7 @@ common_function(typval_T *argvars, typval_T *rettv, int is_funcref)
|
|||||||
* would also work, but some plugins depend on the name being
|
* would also work, but some plugins depend on the name being
|
||||||
* printable text. */
|
* printable text. */
|
||||||
sprintf(sid_buf, "<SNR>%ld_", (long)current_sctx.sc_sid);
|
sprintf(sid_buf, "<SNR>%ld_", (long)current_sctx.sc_sid);
|
||||||
name = alloc((int)(STRLEN(sid_buf) + STRLEN(s + off) + 1));
|
name = alloc(STRLEN(sid_buf) + STRLEN(s + off) + 1);
|
||||||
if (name != NULL)
|
if (name != NULL)
|
||||||
{
|
{
|
||||||
STRCPY(name, sid_buf);
|
STRCPY(name, sid_buf);
|
||||||
@ -12671,7 +12671,7 @@ do_sort_uniq(typval_T *argvars, typval_T *rettv, int sort)
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* Make an array with each entry pointing to an item in the List. */
|
/* Make an array with each entry pointing to an item in the List. */
|
||||||
ptrs = (sortItem_T *)alloc((int)(len * sizeof(sortItem_T)));
|
ptrs = (sortItem_T *)alloc(len * sizeof(sortItem_T));
|
||||||
if (ptrs == NULL)
|
if (ptrs == NULL)
|
||||||
goto theend;
|
goto theend;
|
||||||
|
|
||||||
|
@ -2746,7 +2746,7 @@ barline_parse(vir_T *virp, char_u *text, garray_T *values)
|
|||||||
*/
|
*/
|
||||||
++p;
|
++p;
|
||||||
len = getdigits(&p);
|
len = getdigits(&p);
|
||||||
buf = alloc((int)(len + 1));
|
buf = alloc(len + 1);
|
||||||
if (buf == NULL)
|
if (buf == NULL)
|
||||||
return TRUE;
|
return TRUE;
|
||||||
p = buf;
|
p = buf;
|
||||||
|
@ -2800,7 +2800,7 @@ add_pack_dir_to_rtp(char_u *fname)
|
|||||||
|
|
||||||
oldlen = STRLEN(p_rtp);
|
oldlen = STRLEN(p_rtp);
|
||||||
addlen = STRLEN(fname) + 1; // add one for comma
|
addlen = STRLEN(fname) + 1; // add one for comma
|
||||||
new_rtp = alloc((int)(oldlen + addlen + afterlen + 1)); // add one for NUL
|
new_rtp = alloc(oldlen + addlen + afterlen + 1); // add one for NUL
|
||||||
if (new_rtp == NULL)
|
if (new_rtp == NULL)
|
||||||
goto theend;
|
goto theend;
|
||||||
|
|
||||||
|
@ -4816,7 +4816,7 @@ replace_makeprg(exarg_T *eap, char_u *p, char_u **cmdlinep)
|
|||||||
while ((pos = (char_u *)strstr((char *)pos + 2, "$*")) != NULL)
|
while ((pos = (char_u *)strstr((char *)pos + 2, "$*")) != NULL)
|
||||||
++i;
|
++i;
|
||||||
len = (int)STRLEN(p);
|
len = (int)STRLEN(p);
|
||||||
new_cmdline = alloc((int)(STRLEN(program) + i * (len - 2) + 1));
|
new_cmdline = alloc(STRLEN(program) + i * (len - 2) + 1);
|
||||||
if (new_cmdline == NULL)
|
if (new_cmdline == NULL)
|
||||||
return NULL; /* out of memory */
|
return NULL; /* out of memory */
|
||||||
ptr = new_cmdline;
|
ptr = new_cmdline;
|
||||||
@ -4832,7 +4832,7 @@ replace_makeprg(exarg_T *eap, char_u *p, char_u **cmdlinep)
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
new_cmdline = alloc((int)(STRLEN(program) + STRLEN(p) + 2));
|
new_cmdline = alloc(STRLEN(program) + STRLEN(p) + 2);
|
||||||
if (new_cmdline == NULL)
|
if (new_cmdline == NULL)
|
||||||
return NULL; /* out of memory */
|
return NULL; /* out of memory */
|
||||||
STRCPY(new_cmdline, program);
|
STRCPY(new_cmdline, program);
|
||||||
|
@ -5914,8 +5914,7 @@ init_history(void)
|
|||||||
{
|
{
|
||||||
if (newlen)
|
if (newlen)
|
||||||
{
|
{
|
||||||
temp = (histentry_T *)alloc(
|
temp = (histentry_T *)alloc(newlen * sizeof(histentry_T));
|
||||||
(long_u)(newlen * sizeof(histentry_T)));
|
|
||||||
if (temp == NULL) /* out of memory! */
|
if (temp == NULL) /* out of memory! */
|
||||||
{
|
{
|
||||||
if (type == 0) /* first one: just keep the old length */
|
if (type == 0) /* first one: just keep the old length */
|
||||||
@ -6655,7 +6654,7 @@ prepare_viminfo_history(int asklen, int writing)
|
|||||||
viminfo_history[type] = NULL;
|
viminfo_history[type] = NULL;
|
||||||
else
|
else
|
||||||
viminfo_history[type] = (histentry_T *)lalloc(
|
viminfo_history[type] = (histentry_T *)lalloc(
|
||||||
(long_u)(len * sizeof(histentry_T)), FALSE);
|
len * sizeof(histentry_T), FALSE);
|
||||||
if (viminfo_history[type] == NULL)
|
if (viminfo_history[type] == NULL)
|
||||||
len = 0;
|
len = 0;
|
||||||
viminfo_hislen[type] = len;
|
viminfo_hislen[type] = len;
|
||||||
|
@ -7190,7 +7190,7 @@ readdir_core(
|
|||||||
ga_init2(gap, (int)sizeof(char *), 20);
|
ga_init2(gap, (int)sizeof(char *), 20);
|
||||||
|
|
||||||
#ifdef MSWIN
|
#ifdef MSWIN
|
||||||
buf = alloc((int)MAXPATHL);
|
buf = alloc(MAXPATHL);
|
||||||
if (buf == NULL)
|
if (buf == NULL)
|
||||||
return FAIL;
|
return FAIL;
|
||||||
STRNCPY(buf, path, MAXPATHL-5);
|
STRNCPY(buf, path, MAXPATHL-5);
|
||||||
|
@ -588,9 +588,9 @@ vim_findfile_init(
|
|||||||
if (search_ctx->ffsc_wc_path != NULL)
|
if (search_ctx->ffsc_wc_path != NULL)
|
||||||
{
|
{
|
||||||
wc_path = vim_strsave(search_ctx->ffsc_wc_path);
|
wc_path = vim_strsave(search_ctx->ffsc_wc_path);
|
||||||
temp = alloc((int)(STRLEN(search_ctx->ffsc_wc_path)
|
temp = alloc(STRLEN(search_ctx->ffsc_wc_path)
|
||||||
+ STRLEN(search_ctx->ffsc_fix_path + len)
|
+ STRLEN(search_ctx->ffsc_fix_path + len)
|
||||||
+ 1));
|
+ 1);
|
||||||
if (temp == NULL || wc_path == NULL)
|
if (temp == NULL || wc_path == NULL)
|
||||||
{
|
{
|
||||||
vim_free(buf);
|
vim_free(buf);
|
||||||
@ -722,7 +722,7 @@ vim_findfile(void *search_ctx_arg)
|
|||||||
* filepath is used as buffer for various actions and as the storage to
|
* filepath is used as buffer for various actions and as the storage to
|
||||||
* return a found filename.
|
* return a found filename.
|
||||||
*/
|
*/
|
||||||
if ((file_path = alloc((int)MAXPATHL)) == NULL)
|
if ((file_path = alloc(MAXPATHL)) == NULL)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
#ifdef FEAT_PATH_EXTRA
|
#ifdef FEAT_PATH_EXTRA
|
||||||
@ -1866,7 +1866,7 @@ find_file_in_path_option(
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((buf = alloc((int)(MAXPATHL))) == NULL)
|
if ((buf = alloc(MAXPATHL)) == NULL)
|
||||||
break;
|
break;
|
||||||
|
|
||||||
// copy next path
|
// copy next path
|
||||||
@ -2274,7 +2274,7 @@ expand_path_option(char_u *curdir, garray_T *gap)
|
|||||||
char_u *p;
|
char_u *p;
|
||||||
int len;
|
int len;
|
||||||
|
|
||||||
if ((buf = alloc((int)MAXPATHL)) == NULL)
|
if ((buf = alloc(MAXPATHL)) == NULL)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
while (*path_option != NUL)
|
while (*path_option != NUL)
|
||||||
@ -2424,7 +2424,7 @@ uniquefy_paths(garray_T *gap, char_u *pattern)
|
|||||||
if (regmatch.regprog == NULL)
|
if (regmatch.regprog == NULL)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if ((curdir = alloc((int)(MAXPATHL))) == NULL)
|
if ((curdir = alloc(MAXPATHL)) == NULL)
|
||||||
goto theend;
|
goto theend;
|
||||||
mch_dirname(curdir, MAXPATHL);
|
mch_dirname(curdir, MAXPATHL);
|
||||||
expand_path_option(curdir, &path_ga);
|
expand_path_option(curdir, &path_ga);
|
||||||
@ -2532,7 +2532,7 @@ uniquefy_paths(garray_T *gap, char_u *pattern)
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
rel_path = alloc((int)(STRLEN(short_name) + STRLEN(PATHSEPSTR) + 2));
|
rel_path = alloc(STRLEN(short_name) + STRLEN(PATHSEPSTR) + 2);
|
||||||
if (rel_path == NULL)
|
if (rel_path == NULL)
|
||||||
goto theend;
|
goto theend;
|
||||||
STRCPY(rel_path, ".");
|
STRCPY(rel_path, ".");
|
||||||
|
@ -376,7 +376,7 @@ CVim::Eval(BSTR expr, BSTR *result)
|
|||||||
if (len == 0)
|
if (len == 0)
|
||||||
return E_INVALIDARG;
|
return E_INVALIDARG;
|
||||||
|
|
||||||
buffer = (char *)alloc((unsigned)len);
|
buffer = (char *)alloc(len);
|
||||||
|
|
||||||
if (buffer == NULL)
|
if (buffer == NULL)
|
||||||
return E_OUTOFMEMORY;
|
return E_OUTOFMEMORY;
|
||||||
|
@ -2953,7 +2953,7 @@ FunctionNew(PyTypeObject *subtype, char_u *name, int argc, typval_T *argv,
|
|||||||
char_u *np;
|
char_u *np;
|
||||||
size_t len = STRLEN(p) + 1;
|
size_t len = STRLEN(p) + 1;
|
||||||
|
|
||||||
if ((np = alloc((int)len + 2)) == NULL)
|
if ((np = alloc(len + 2)) == NULL)
|
||||||
{
|
{
|
||||||
vim_free(p);
|
vim_free(p);
|
||||||
return NULL;
|
return NULL;
|
||||||
@ -3139,7 +3139,7 @@ set_partial(FunctionObject *self, partial_T *pt, int exported)
|
|||||||
if (exported)
|
if (exported)
|
||||||
{
|
{
|
||||||
pt->pt_argv = (typval_T *)alloc_clear(
|
pt->pt_argv = (typval_T *)alloc_clear(
|
||||||
sizeof(typval_T) * self->argc);
|
sizeof(typval_T) * self->argc);
|
||||||
for (i = 0; i < pt->pt_argc; ++i)
|
for (i = 0; i < pt->pt_argc; ++i)
|
||||||
copy_tv(&self->argv[i], &pt->pt_argv[i]);
|
copy_tv(&self->argv[i], &pt->pt_argv[i]);
|
||||||
}
|
}
|
||||||
@ -4262,7 +4262,7 @@ StringToLine(PyObject *obj)
|
|||||||
/* Create a copy of the string, with internal nulls replaced by
|
/* Create a copy of the string, with internal nulls replaced by
|
||||||
* newline characters, as is the vim convention.
|
* newline characters, as is the vim convention.
|
||||||
*/
|
*/
|
||||||
save = (char *)alloc((unsigned)(len+1));
|
save = (char *)alloc(len+1);
|
||||||
if (save == NULL)
|
if (save == NULL)
|
||||||
{
|
{
|
||||||
PyErr_NoMemory();
|
PyErr_NoMemory();
|
||||||
|
@ -92,7 +92,7 @@ list_alloc(void)
|
|||||||
list_alloc_id(alloc_id_T id UNUSED)
|
list_alloc_id(alloc_id_T id UNUSED)
|
||||||
{
|
{
|
||||||
#ifdef FEAT_EVAL
|
#ifdef FEAT_EVAL
|
||||||
if (alloc_fail_id == id && alloc_does_fail((long_u)sizeof(list_T)))
|
if (alloc_fail_id == id && alloc_does_fail(sizeof(list_T)))
|
||||||
return NULL;
|
return NULL;
|
||||||
#endif
|
#endif
|
||||||
return (list_alloc());
|
return (list_alloc());
|
||||||
@ -122,7 +122,7 @@ rettv_list_alloc(typval_T *rettv)
|
|||||||
rettv_list_alloc_id(typval_T *rettv, alloc_id_T id UNUSED)
|
rettv_list_alloc_id(typval_T *rettv, alloc_id_T id UNUSED)
|
||||||
{
|
{
|
||||||
#ifdef FEAT_EVAL
|
#ifdef FEAT_EVAL
|
||||||
if (alloc_fail_id == id && alloc_does_fail((long_u)sizeof(list_T)))
|
if (alloc_fail_id == id && alloc_does_fail(sizeof(list_T)))
|
||||||
return FAIL;
|
return FAIL;
|
||||||
#endif
|
#endif
|
||||||
return rettv_list_alloc(rettv);
|
return rettv_list_alloc(rettv);
|
||||||
|
@ -875,7 +875,7 @@ add_msg_hist(
|
|||||||
(void)delete_first_msg();
|
(void)delete_first_msg();
|
||||||
|
|
||||||
/* allocate an entry and add the message at the end of the history */
|
/* allocate an entry and add the message at the end of the history */
|
||||||
p = (struct msg_hist *)alloc((int)sizeof(struct msg_hist));
|
p = (struct msg_hist *)alloc(sizeof(struct msg_hist));
|
||||||
if (p != NULL)
|
if (p != NULL)
|
||||||
{
|
{
|
||||||
if (len < 0)
|
if (len < 0)
|
||||||
@ -2360,7 +2360,7 @@ store_sb_text(
|
|||||||
|
|
||||||
if (s > *sb_str)
|
if (s > *sb_str)
|
||||||
{
|
{
|
||||||
mp = (msgchunk_T *)alloc((int)(sizeof(msgchunk_T) + (s - *sb_str)));
|
mp = (msgchunk_T *)alloc(sizeof(msgchunk_T) + (s - *sb_str));
|
||||||
if (mp != NULL)
|
if (mp != NULL)
|
||||||
{
|
{
|
||||||
mp->sb_eol = finish;
|
mp->sb_eol = finish;
|
||||||
|
@ -3446,7 +3446,7 @@ dos_expandpath(
|
|||||||
|
|
||||||
// Make room for file name. When doing encoding conversion the actual
|
// Make room for file name. When doing encoding conversion the actual
|
||||||
// length may be quite a bit longer, thus use the maximum possible length.
|
// length may be quite a bit longer, thus use the maximum possible length.
|
||||||
buf = alloc((int)MAXPATHL);
|
buf = alloc(MAXPATHL);
|
||||||
if (buf == NULL)
|
if (buf == NULL)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
@ -3690,7 +3690,7 @@ unix_expandpath(
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* make room for file name */
|
/* make room for file name */
|
||||||
buf = alloc((int)STRLEN(path) + BASENAMELEN + 5);
|
buf = alloc(STRLEN(path) + BASENAMELEN + 5);
|
||||||
if (buf == NULL)
|
if (buf == NULL)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
|
@ -1290,7 +1290,7 @@ vim_strnsave(char_u *string, int len)
|
|||||||
{
|
{
|
||||||
char_u *p;
|
char_u *p;
|
||||||
|
|
||||||
p = alloc((size_t)(len + 1));
|
p = alloc(len + 1);
|
||||||
if (p != NULL)
|
if (p != NULL)
|
||||||
{
|
{
|
||||||
STRNCPY(p, string, len);
|
STRNCPY(p, string, len);
|
||||||
|
@ -3355,7 +3355,7 @@ copy_yank_reg(yankreg_T *reg)
|
|||||||
free_yank_all();
|
free_yank_all();
|
||||||
*y_current = *curr;
|
*y_current = *curr;
|
||||||
y_current->y_array = (char_u **)lalloc_clear(
|
y_current->y_array = (char_u **)lalloc_clear(
|
||||||
(long_u)(sizeof(char_u *) * y_current->y_size), TRUE);
|
sizeof(char_u *) * y_current->y_size, TRUE);
|
||||||
if (y_current->y_array == NULL)
|
if (y_current->y_array == NULL)
|
||||||
y_current->y_size = 0;
|
y_current->y_size = 0;
|
||||||
else
|
else
|
||||||
|
@ -245,7 +245,7 @@ mch_getenv(char_u *lognam)
|
|||||||
else if ((sbuf = getenv((char *)lognam)))
|
else if ((sbuf = getenv((char *)lognam)))
|
||||||
{
|
{
|
||||||
lengte = strlen(sbuf) + 1;
|
lengte = strlen(sbuf) + 1;
|
||||||
cp = (char_u *)alloc((size_t)lengte);
|
cp = (char_u *)alloc(lengte);
|
||||||
if (cp)
|
if (cp)
|
||||||
strcpy((char *)cp, sbuf);
|
strcpy((char *)cp, sbuf);
|
||||||
return cp;
|
return cp;
|
||||||
|
@ -7117,7 +7117,7 @@ fix_arg_enc(void)
|
|||||||
return;
|
return;
|
||||||
|
|
||||||
/* Remember the buffer numbers for the arguments. */
|
/* Remember the buffer numbers for the arguments. */
|
||||||
fnum_list = (int *)alloc((int)sizeof(int) * GARGCOUNT);
|
fnum_list = (int *)alloc(sizeof(int) * GARGCOUNT);
|
||||||
if (fnum_list == NULL)
|
if (fnum_list == NULL)
|
||||||
return; /* out of memory */
|
return; /* out of memory */
|
||||||
for (i = 0; i < GARGCOUNT; ++i)
|
for (i = 0; i < GARGCOUNT; ++i)
|
||||||
|
@ -1815,7 +1815,7 @@ qf_store_title(qf_list_T *qfl, char_u *title)
|
|||||||
|
|
||||||
if (title != NULL)
|
if (title != NULL)
|
||||||
{
|
{
|
||||||
char_u *p = alloc((int)STRLEN(title) + 2);
|
char_u *p = alloc(STRLEN(title) + 2);
|
||||||
|
|
||||||
qfl->qf_title = p;
|
qfl->qf_title = p;
|
||||||
if (p != NULL)
|
if (p != NULL)
|
||||||
|
@ -4799,7 +4799,7 @@ addstate_here(
|
|||||||
emsg(_(e_maxmempat));
|
emsg(_(e_maxmempat));
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
newl = (nfa_thread_T *)alloc((int)newsize);
|
newl = (nfa_thread_T *)alloc(newsize);
|
||||||
if (newl == NULL)
|
if (newl == NULL)
|
||||||
return NULL;
|
return NULL;
|
||||||
l->len = newlen;
|
l->len = newlen;
|
||||||
|
13
src/screen.c
13
src/screen.c
@ -328,30 +328,27 @@ redraw_asap(int type)
|
|||||||
|
|
||||||
/* Allocate space to save the text displayed in the command line area. */
|
/* Allocate space to save the text displayed in the command line area. */
|
||||||
rows = screen_Rows - cmdline_row;
|
rows = screen_Rows - cmdline_row;
|
||||||
screenline = (schar_T *)lalloc(
|
screenline = (schar_T *)lalloc(rows * cols * sizeof(schar_T), FALSE);
|
||||||
(long_u)(rows * cols * sizeof(schar_T)), FALSE);
|
screenattr = (sattr_T *)lalloc(rows * cols * sizeof(sattr_T), FALSE);
|
||||||
screenattr = (sattr_T *)lalloc(
|
|
||||||
(long_u)(rows * cols * sizeof(sattr_T)), FALSE);
|
|
||||||
if (screenline == NULL || screenattr == NULL)
|
if (screenline == NULL || screenattr == NULL)
|
||||||
ret = 2;
|
ret = 2;
|
||||||
if (enc_utf8)
|
if (enc_utf8)
|
||||||
{
|
{
|
||||||
screenlineUC = (u8char_T *)lalloc(
|
screenlineUC = (u8char_T *)lalloc(
|
||||||
(long_u)(rows * cols * sizeof(u8char_T)), FALSE);
|
rows * cols * sizeof(u8char_T), FALSE);
|
||||||
if (screenlineUC == NULL)
|
if (screenlineUC == NULL)
|
||||||
ret = 2;
|
ret = 2;
|
||||||
for (i = 0; i < p_mco; ++i)
|
for (i = 0; i < p_mco; ++i)
|
||||||
{
|
{
|
||||||
screenlineC[i] = (u8char_T *)lalloc(
|
screenlineC[i] = (u8char_T *)lalloc(
|
||||||
(long_u)(rows * cols * sizeof(u8char_T)), FALSE);
|
rows * cols * sizeof(u8char_T), FALSE);
|
||||||
if (screenlineC[i] == NULL)
|
if (screenlineC[i] == NULL)
|
||||||
ret = 2;
|
ret = 2;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (enc_dbcs == DBCS_JPNU)
|
if (enc_dbcs == DBCS_JPNU)
|
||||||
{
|
{
|
||||||
screenline2 = (schar_T *)lalloc(
|
screenline2 = (schar_T *)lalloc(rows * cols * sizeof(schar_T), FALSE);
|
||||||
(long_u)(rows * cols * sizeof(schar_T)), FALSE);
|
|
||||||
if (screenline2 == NULL)
|
if (screenline2 == NULL)
|
||||||
ret = 2;
|
ret = 2;
|
||||||
}
|
}
|
||||||
|
@ -1429,7 +1429,7 @@ do_search(
|
|||||||
// Reserve enough space for the search pattern + offset.
|
// Reserve enough space for the search pattern + offset.
|
||||||
len = STRLEN(p) + off_len + 3;
|
len = STRLEN(p) + off_len + 3;
|
||||||
|
|
||||||
msgbuf = alloc((int)len);
|
msgbuf = alloc(len);
|
||||||
if (msgbuf != NULL)
|
if (msgbuf != NULL)
|
||||||
{
|
{
|
||||||
vim_memset(msgbuf, ' ', len);
|
vim_memset(msgbuf, ' ', len);
|
||||||
|
@ -85,8 +85,7 @@ sign_group_ref(char_u *groupname)
|
|||||||
if (HASHITEM_EMPTY(hi))
|
if (HASHITEM_EMPTY(hi))
|
||||||
{
|
{
|
||||||
// new group
|
// new group
|
||||||
group = (signgroup_T *)alloc(
|
group = (signgroup_T *)alloc(sizeof(signgroup_T) + STRLEN(groupname));
|
||||||
(unsigned)(sizeof(signgroup_T) + STRLEN(groupname)));
|
|
||||||
if (group == NULL)
|
if (group == NULL)
|
||||||
return NULL;
|
return NULL;
|
||||||
STRCPY(group->sg_name, groupname);
|
STRCPY(group->sg_name, groupname);
|
||||||
@ -737,8 +736,7 @@ alloc_new_sign(char_u *name)
|
|||||||
int start = next_sign_typenr;
|
int start = next_sign_typenr;
|
||||||
|
|
||||||
// Allocate a new sign.
|
// Allocate a new sign.
|
||||||
sp = (sign_T *)alloc_clear_id((unsigned)sizeof(sign_T),
|
sp = (sign_T *)alloc_clear_id(sizeof(sign_T), aid_sign_define_by_name);
|
||||||
aid_sign_define_by_name);
|
|
||||||
if (sp == NULL)
|
if (sp == NULL)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
|
@ -4494,7 +4494,7 @@ add_keyword(
|
|||||||
name_folded, MAXKEYWLEN + 1);
|
name_folded, MAXKEYWLEN + 1);
|
||||||
else
|
else
|
||||||
name_ic = name;
|
name_ic = name;
|
||||||
kp = (keyentry_T *)alloc((int)(sizeof(keyentry_T) + STRLEN(name_ic)));
|
kp = (keyentry_T *)alloc(sizeof(keyentry_T) + STRLEN(name_ic));
|
||||||
if (kp == NULL)
|
if (kp == NULL)
|
||||||
return;
|
return;
|
||||||
STRCPY(kp->keyword, name_ic);
|
STRCPY(kp->keyword, name_ic);
|
||||||
@ -6001,7 +6001,7 @@ get_id_list(
|
|||||||
{
|
{
|
||||||
for (end = p; *end && !VIM_ISWHITE(*end) && *end != ','; ++end)
|
for (end = p; *end && !VIM_ISWHITE(*end) && *end != ','; ++end)
|
||||||
;
|
;
|
||||||
name = alloc((int)(end - p + 3)); /* leave room for "^$" */
|
name = alloc(end - p + 3); /* leave room for "^$" */
|
||||||
if (name == NULL)
|
if (name == NULL)
|
||||||
{
|
{
|
||||||
failed = TRUE;
|
failed = TRUE;
|
||||||
|
10
src/tag.c
10
src/tag.c
@ -1430,7 +1430,7 @@ find_tagfunc_tags(
|
|||||||
if (name_only)
|
if (name_only)
|
||||||
mfp = vim_strsave(res_name);
|
mfp = vim_strsave(res_name);
|
||||||
else
|
else
|
||||||
mfp = (char_u *)alloc((int)sizeof(char_u) + len + 1);
|
mfp = (char_u *)alloc(sizeof(char_u) + len + 1);
|
||||||
|
|
||||||
if (mfp == NULL)
|
if (mfp == NULL)
|
||||||
continue;
|
continue;
|
||||||
@ -2536,7 +2536,7 @@ parse_line:
|
|||||||
*/
|
*/
|
||||||
*tagp.tagname_end = NUL;
|
*tagp.tagname_end = NUL;
|
||||||
len = (int)(tagp.tagname_end - tagp.tagname);
|
len = (int)(tagp.tagname_end - tagp.tagname);
|
||||||
mfp = (char_u *)alloc((int)sizeof(char_u)
|
mfp = (char_u *)alloc(sizeof(char_u)
|
||||||
+ len + 10 + ML_EXTRA + 1);
|
+ len + 10 + ML_EXTRA + 1);
|
||||||
if (mfp != NULL)
|
if (mfp != NULL)
|
||||||
{
|
{
|
||||||
@ -2585,7 +2585,7 @@ parse_line:
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
len = (int)(tagp.tagname_end - tagp.tagname);
|
len = (int)(tagp.tagname_end - tagp.tagname);
|
||||||
mfp = (char_u *)alloc((int)sizeof(char_u) + len + 1);
|
mfp = (char_u *)alloc(sizeof(char_u) + len + 1);
|
||||||
if (mfp != NULL)
|
if (mfp != NULL)
|
||||||
vim_strncpy(mfp, tagp.tagname, len);
|
vim_strncpy(mfp, tagp.tagname, len);
|
||||||
|
|
||||||
@ -2620,7 +2620,7 @@ parse_line:
|
|||||||
else
|
else
|
||||||
++len;
|
++len;
|
||||||
#endif
|
#endif
|
||||||
mfp = (char_u *)alloc((int)sizeof(char_u) + len + 1);
|
mfp = (char_u *)alloc(sizeof(char_u) + len + 1);
|
||||||
if (mfp != NULL)
|
if (mfp != NULL)
|
||||||
{
|
{
|
||||||
p = mfp;
|
p = mfp;
|
||||||
@ -3346,7 +3346,7 @@ jumpto_tag(
|
|||||||
/* Make a copy of the line, it can become invalid when an autocommand calls
|
/* Make a copy of the line, it can become invalid when an autocommand calls
|
||||||
* back here recursively. */
|
* back here recursively. */
|
||||||
len = matching_line_len(lbuf_arg) + 1;
|
len = matching_line_len(lbuf_arg) + 1;
|
||||||
lbuf = alloc((int)len);
|
lbuf = alloc(len);
|
||||||
if (lbuf != NULL)
|
if (lbuf != NULL)
|
||||||
mch_memmove(lbuf, lbuf_arg, len);
|
mch_memmove(lbuf, lbuf_arg, len);
|
||||||
|
|
||||||
|
@ -4188,7 +4188,7 @@ add_termcode(char_u *name, char_u *string, int flags)
|
|||||||
{
|
{
|
||||||
tc_max_len += 20;
|
tc_max_len += 20;
|
||||||
new_tc = (struct termcode *)alloc(
|
new_tc = (struct termcode *)alloc(
|
||||||
(unsigned)(tc_max_len * sizeof(struct termcode)));
|
tc_max_len * sizeof(struct termcode));
|
||||||
if (new_tc == NULL)
|
if (new_tc == NULL)
|
||||||
{
|
{
|
||||||
tc_max_len -= 20;
|
tc_max_len -= 20;
|
||||||
@ -7072,7 +7072,7 @@ gui_get_color_cmn(char_u *name)
|
|||||||
if (!counting)
|
if (!counting)
|
||||||
{
|
{
|
||||||
colornames_table = (struct rgbcolor_table_S *)alloc(
|
colornames_table = (struct rgbcolor_table_S *)alloc(
|
||||||
(unsigned)(sizeof(struct rgbcolor_table_S) * size));
|
sizeof(struct rgbcolor_table_S) * size);
|
||||||
if (colornames_table == NULL)
|
if (colornames_table == NULL)
|
||||||
{
|
{
|
||||||
fclose(fd);
|
fclose(fd);
|
||||||
|
@ -534,7 +534,7 @@ term_start(
|
|||||||
cmd = (char_u*)"";
|
cmd = (char_u*)"";
|
||||||
|
|
||||||
len = STRLEN(cmd) + 10;
|
len = STRLEN(cmd) + 10;
|
||||||
p = alloc((int)len);
|
p = alloc(len);
|
||||||
|
|
||||||
for (i = 0; p != NULL; ++i)
|
for (i = 0; p != NULL; ++i)
|
||||||
{
|
{
|
||||||
@ -1630,7 +1630,7 @@ update_snapshot(term_T *term)
|
|||||||
if (len == 0)
|
if (len == 0)
|
||||||
p = NULL;
|
p = NULL;
|
||||||
else
|
else
|
||||||
p = (cellattr_T *)alloc((int)sizeof(cellattr_T) * len);
|
p = (cellattr_T *)alloc(sizeof(cellattr_T) * len);
|
||||||
if ((p != NULL || len == 0)
|
if ((p != NULL || len == 0)
|
||||||
&& ga_grow(&term->tl_scrollback, 1) == OK)
|
&& ga_grow(&term->tl_scrollback, 1) == OK)
|
||||||
{
|
{
|
||||||
@ -2884,7 +2884,7 @@ handle_pushline(int cols, const VTermScreenCell *cells, void *user)
|
|||||||
|
|
||||||
ga_init2(&ga, 1, 100);
|
ga_init2(&ga, 1, 100);
|
||||||
if (len > 0)
|
if (len > 0)
|
||||||
p = (cellattr_T *)alloc((int)sizeof(cellattr_T) * len);
|
p = (cellattr_T *)alloc(sizeof(cellattr_T) * len);
|
||||||
if (p != NULL)
|
if (p != NULL)
|
||||||
{
|
{
|
||||||
for (col = 0; col < len; col += cells[col].width)
|
for (col = 0; col < len; col += cells[col].width)
|
||||||
@ -3718,7 +3718,7 @@ handle_drop_command(listitem_T *item)
|
|||||||
p = dict_get_string(dict, (char_u *)"encoding", FALSE);
|
p = dict_get_string(dict, (char_u *)"encoding", FALSE);
|
||||||
if (p != NULL)
|
if (p != NULL)
|
||||||
{
|
{
|
||||||
ea.cmd = alloc((int)STRLEN(p) + 12);
|
ea.cmd = alloc(STRLEN(p) + 12);
|
||||||
if (ea.cmd != NULL)
|
if (ea.cmd != NULL)
|
||||||
{
|
{
|
||||||
sprintf((char *)ea.cmd, "sbuf ++enc=%s", p);
|
sprintf((char *)ea.cmd, "sbuf ++enc=%s", p);
|
||||||
@ -4031,7 +4031,7 @@ term_get_status_text(term_T *term)
|
|||||||
else
|
else
|
||||||
txt = (char_u *)_("finished");
|
txt = (char_u *)_("finished");
|
||||||
len = 9 + STRLEN(term->tl_buffer->b_fname) + STRLEN(txt);
|
len = 9 + STRLEN(term->tl_buffer->b_fname) + STRLEN(txt);
|
||||||
term->tl_status_text = alloc((int)len);
|
term->tl_status_text = alloc(len);
|
||||||
if (term->tl_status_text != NULL)
|
if (term->tl_status_text != NULL)
|
||||||
vim_snprintf((char *)term->tl_status_text, len, "%s [%s]",
|
vim_snprintf((char *)term->tl_status_text, len, "%s [%s]",
|
||||||
term->tl_buffer->b_fname, txt);
|
term->tl_buffer->b_fname, txt);
|
||||||
@ -4663,7 +4663,7 @@ term_load_dump(typval_T *argvars, typval_T *rettv, int do_diff)
|
|||||||
{
|
{
|
||||||
size_t len = STRLEN(fname1) + 12;
|
size_t len = STRLEN(fname1) + 12;
|
||||||
|
|
||||||
fname_tofree = alloc((int)len);
|
fname_tofree = alloc(len);
|
||||||
if (fname_tofree != NULL)
|
if (fname_tofree != NULL)
|
||||||
{
|
{
|
||||||
vim_snprintf((char *)fname_tofree, len, "dump diff %s", fname1);
|
vim_snprintf((char *)fname_tofree, len, "dump diff %s", fname1);
|
||||||
@ -4935,7 +4935,7 @@ term_swap_diff()
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
size_t size = sizeof(sb_line_T) * term->tl_scrollback.ga_len;
|
size_t size = sizeof(sb_line_T) * term->tl_scrollback.ga_len;
|
||||||
sb_line_T *temp = (sb_line_T *)alloc((int)size);
|
sb_line_T *temp = (sb_line_T *)alloc(size);
|
||||||
|
|
||||||
/* need to copy cell properties into temp memory */
|
/* need to copy cell properties into temp memory */
|
||||||
if (temp != NULL)
|
if (temp != NULL)
|
||||||
@ -5800,7 +5800,7 @@ conpty_term_and_job_init(
|
|||||||
{
|
{
|
||||||
/* Request by CreateProcessW */
|
/* Request by CreateProcessW */
|
||||||
breq = wcslen(cmd_wchar) + 1 + 1; /* Addition of NUL by API */
|
breq = wcslen(cmd_wchar) + 1 + 1; /* Addition of NUL by API */
|
||||||
cmd_wchar_copy = (PWSTR)alloc((int)(breq * sizeof(WCHAR)));
|
cmd_wchar_copy = (PWSTR)alloc(breq * sizeof(WCHAR));
|
||||||
wcsncpy(cmd_wchar_copy, cmd_wchar, breq - 1);
|
wcsncpy(cmd_wchar_copy, cmd_wchar, breq - 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -5830,7 +5830,7 @@ conpty_term_and_job_init(
|
|||||||
/* Set up pipe inheritance safely: Vista or later. */
|
/* Set up pipe inheritance safely: Vista or later. */
|
||||||
pInitializeProcThreadAttributeList(NULL, 1, 0, &breq);
|
pInitializeProcThreadAttributeList(NULL, 1, 0, &breq);
|
||||||
term->tl_siex.lpAttributeList =
|
term->tl_siex.lpAttributeList =
|
||||||
(PPROC_THREAD_ATTRIBUTE_LIST)alloc((int)breq);
|
(PPROC_THREAD_ATTRIBUTE_LIST)alloc(breq);
|
||||||
if (!term->tl_siex.lpAttributeList)
|
if (!term->tl_siex.lpAttributeList)
|
||||||
goto failed;
|
goto failed;
|
||||||
if (!pInitializeProcThreadAttributeList(term->tl_siex.lpAttributeList, 1,
|
if (!pInitializeProcThreadAttributeList(term->tl_siex.lpAttributeList, 1,
|
||||||
|
@ -1220,7 +1220,7 @@ join_prop_lines(
|
|||||||
oldproplen = get_text_props(curbuf, lnum, &props, FALSE);
|
oldproplen = get_text_props(curbuf, lnum, &props, FALSE);
|
||||||
|
|
||||||
len = STRLEN(newp) + 1;
|
len = STRLEN(newp) + 1;
|
||||||
line = alloc((int)(len + (oldproplen + proplen) * sizeof(textprop_T)));
|
line = alloc(len + (oldproplen + proplen) * sizeof(textprop_T));
|
||||||
if (line == NULL)
|
if (line == NULL)
|
||||||
return;
|
return;
|
||||||
mch_memmove(line, newp, len);
|
mch_memmove(line, newp, len);
|
||||||
|
@ -767,6 +767,8 @@ static char *(features[]) =
|
|||||||
|
|
||||||
static int included_patches[] =
|
static int included_patches[] =
|
||||||
{ /* Add new patch number below this line */
|
{ /* Add new patch number below this line */
|
||||||
|
/**/
|
||||||
|
1393,
|
||||||
/**/
|
/**/
|
||||||
1392,
|
1392,
|
||||||
/**/
|
/**/
|
||||||
|
Loading…
x
Reference in New Issue
Block a user