summaryrefslogtreecommitdiff
path: root/src/if_py_both.h
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-05-28 23:08:19 +0200
committerBram Moolenaar <Bram@vim.org>2019-05-28 23:08:19 +0200
commitc799fe206e61f2e2c1231bc46cbe4bb354f3da69 (patch)
tree68b3d2a8bb82519e29fc95f317d2ee02b07f95fa /src/if_py_both.h
parentb58a4b938c4bc7e0499700859bd7abba9acc5b11 (diff)
downloadvim-git-c799fe206e61f2e2c1231bc46cbe4bb354f3da69.tar.gz
patch 8.1.1414: alloc() returning "char_u *" causes a lot of type castsv8.1.1414
Problem: Alloc() returning "char_u *" causes a lot of type casts. Solution: Have it return "void *". (Mike Williams) Define ALLOC_ONE() to check the simple allocations.
Diffstat (limited to 'src/if_py_both.h')
-rw-r--r--src/if_py_both.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/if_py_both.h b/src/if_py_both.h
index bc33a80a2..5362d4563 100644
--- a/src/if_py_both.h
+++ b/src/if_py_both.h
@@ -3138,8 +3138,7 @@ set_partial(FunctionObject *self, partial_T *pt, int exported)
pt->pt_argc = self->argc;
if (exported)
{
- pt->pt_argv = (typval_T *)alloc_clear(
- sizeof(typval_T) * self->argc);
+ pt->pt_argv = ALLOC_CLEAR_MULT(typval_T, self->argc);
for (i = 0; i < pt->pt_argc; ++i)
copy_tv(&self->argv[i], &pt->pt_argv[i]);
}
@@ -4262,7 +4261,7 @@ StringToLine(PyObject *obj)
/* Create a copy of the string, with internal nulls replaced by
* newline characters, as is the vim convention.
*/
- save = (char *)alloc(len+1);
+ save = alloc(len+1);
if (save == NULL)
{
PyErr_NoMemory();
@@ -6243,7 +6242,8 @@ _ConvertFromPyObject(PyObject *obj, typval_T *tv, PyObject *lookup_dict)
FunctionObject *func = (FunctionObject *) obj;
if (func->self != NULL || func->argv != NULL)
{
- partial_T *pt = (partial_T *)alloc_clear(sizeof(partial_T));
+ partial_T *pt = ALLOC_CLEAR_ONE(partial_T);
+
set_partial(func, pt, TRUE);
tv->vval.v_partial = pt;
tv->v_type = VAR_PARTIAL;