From effd234960140be4ec9a66411db162594a2b6906 Mon Sep 17 00:00:00 2001
From: Jan Edmund Lazo <jan.lazo@mail.utoronto.ca>
Date: Mon, 8 Mar 2021 21:15:23 -0500
Subject: vim-patch:8.2.1507: using malloc() directly

Problem:    Using malloc() directly.
Solution:   Use ALLOC_ONE().  Remove superfluous typecast.  (Hussam al-Homsi,
            closes vim/vim#6768)
https://github.com/vim/vim/commit/51b6eb47b3c41b01a5559b099e65354c8897093e
---
 src/nvim/eval.c    | 24 ++++++++----------------
 src/nvim/memline.c |  4 ++--
 2 files changed, 10 insertions(+), 18 deletions(-)

(limited to 'src')

diff --git a/src/nvim/eval.c b/src/nvim/eval.c
index 6d97310c1c..63d5216cc4 100644
--- a/src/nvim/eval.c
+++ b/src/nvim/eval.c
@@ -5280,14 +5280,10 @@ bool set_ref_in_item(typval_T *tv, int copyID, ht_stack_T **ht_stack,
         if (ht_stack == NULL) {
           abort = set_ref_in_ht(&dd->dv_hashtab, copyID, list_stack);
         } else {
-          ht_stack_T *newitem = try_malloc(sizeof(ht_stack_T));
-          if (newitem == NULL) {
-            abort = true;
-          } else {
-            newitem->ht = &dd->dv_hashtab;
-            newitem->prev = *ht_stack;
-            *ht_stack = newitem;
-          }
+          ht_stack_T *const newitem = xmalloc(sizeof(ht_stack_T));
+          newitem->ht = &dd->dv_hashtab;
+          newitem->prev = *ht_stack;
+          *ht_stack = newitem;
         }
 
         QUEUE *w = NULL;
@@ -5308,14 +5304,10 @@ bool set_ref_in_item(typval_T *tv, int copyID, ht_stack_T **ht_stack,
         if (list_stack == NULL) {
           abort = set_ref_in_list(ll, copyID, ht_stack);
         } else {
-          list_stack_T *newitem = try_malloc(sizeof(list_stack_T));
-          if (newitem == NULL) {
-            abort = true;
-          } else {
-            newitem->list = ll;
-            newitem->prev = *list_stack;
-            *list_stack = newitem;
-          }
+          list_stack_T *const newitem = xmalloc(sizeof(list_stack_T));
+          newitem->list = ll;
+          newitem->prev = *list_stack;
+          *list_stack = newitem;
         }
       }
       break;
diff --git a/src/nvim/memline.c b/src/nvim/memline.c
index 293a4d01db..34d8eb0ffe 100644
--- a/src/nvim/memline.c
+++ b/src/nvim/memline.c
@@ -3859,8 +3859,8 @@ static void ml_updatechunk(buf_T *buf, linenr_T line, long len, int updtype)
     /* May resize here so we don't have to do it in both cases below */
     if (buf->b_ml.ml_usedchunks + 1 >= buf->b_ml.ml_numchunks) {
       buf->b_ml.ml_numchunks = buf->b_ml.ml_numchunks * 3 / 2;
-      buf->b_ml.ml_chunksize = (chunksize_T *)
-                               xrealloc(buf->b_ml.ml_chunksize,
+      buf->b_ml.ml_chunksize = xrealloc(
+          buf->b_ml.ml_chunksize,
           sizeof(chunksize_T) * buf->b_ml.ml_numchunks);
     }
 
-- 
cgit