summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/eval.c7
-rw-r--r--src/memline.c3
-rw-r--r--src/version.c2
-rw-r--r--src/vimrun.c2
4 files changed, 8 insertions, 6 deletions
diff --git a/src/eval.c b/src/eval.c
index cc044a4bd..4b1e0f19b 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -4352,7 +4352,8 @@ set_ref_in_item(
}
else
{
- ht_stack_T *newitem = (ht_stack_T*)malloc(sizeof(ht_stack_T));
+ ht_stack_T *newitem = ALLOC_ONE(ht_stack_T);
+
if (newitem == NULL)
abort = TRUE;
else
@@ -4378,8 +4379,8 @@ set_ref_in_item(
}
else
{
- list_stack_T *newitem = (list_stack_T*)malloc(
- sizeof(list_stack_T));
+ list_stack_T *newitem = ALLOC_ONE(list_stack_T);
+
if (newitem == NULL)
abort = TRUE;
else
diff --git a/src/memline.c b/src/memline.c
index 084a8b0fa..1c594d453 100644
--- a/src/memline.c
+++ b/src/memline.c
@@ -5448,8 +5448,7 @@ ml_updatechunk(
chunksize_T *t_chunksize = buf->b_ml.ml_chunksize;
buf->b_ml.ml_numchunks = buf->b_ml.ml_numchunks * 3 / 2;
- buf->b_ml.ml_chunksize = (chunksize_T *)
- vim_realloc(buf->b_ml.ml_chunksize,
+ buf->b_ml.ml_chunksize = vim_realloc(buf->b_ml.ml_chunksize,
sizeof(chunksize_T) * buf->b_ml.ml_numchunks);
if (buf->b_ml.ml_chunksize == NULL)
{
diff --git a/src/version.c b/src/version.c
index 575f343ea..bb1624f6e 100644
--- a/src/version.c
+++ b/src/version.c
@@ -755,6 +755,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1507,
+/**/
1506,
/**/
1505,
diff --git a/src/vimrun.c b/src/vimrun.c
index 26c4aa4c6..9a4c076d6 100644
--- a/src/vimrun.c
+++ b/src/vimrun.c
@@ -77,7 +77,7 @@ main(void)
if (cmdlen >= 2 && p[0] == L'"' && p[cmdlen - 1] == L'"')
{
cmdlen += 3;
- cmd = (wchar_t *)malloc(cmdlen * sizeof(wchar_t));
+ cmd = malloc(cmdlen * sizeof(wchar_t));
if (cmd == NULL)
{
perror("vimrun malloc(): ");