summaryrefslogtreecommitdiff
path: root/src/if_py_both.h
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-01-13 23:51:14 +0100
committerBram Moolenaar <Bram@vim.org>2019-01-13 23:51:14 +0100
commitb1443b480fe9965a6eaa9211657d299e88964084 (patch)
tree90f624e14617d31e6d32bdd4d6cb6e8633523252 /src/if_py_both.h
parentf9e3e09fdc93be9f0d47afbc6c7df1188c2a5a0d (diff)
downloadvim-git-b1443b480fe9965a6eaa9211657d299e88964084.tar.gz
patch 8.1.0744: compiler warnings for signed/unsigned stringsv8.1.0744
Problem: Compiler warnings for signed/unsigned strings. Solution: A few more type cast fixes.
Diffstat (limited to 'src/if_py_both.h')
-rw-r--r--src/if_py_both.h16
1 files changed, 11 insertions, 5 deletions
diff --git a/src/if_py_both.h b/src/if_py_both.h
index 165c84728..85141e11a 100644
--- a/src/if_py_both.h
+++ b/src/if_py_both.h
@@ -410,6 +410,12 @@ writer(writefn fn, char_u *str, PyInt n)
}
static int
+msg_wrapper(char *text)
+{
+ return msg((char_u *)text);
+}
+
+ static int
write_output(OutputObject *self, PyObject *string)
{
Py_ssize_t len = 0;
@@ -421,7 +427,7 @@ write_output(OutputObject *self, PyObject *string)
Py_BEGIN_ALLOW_THREADS
Python_Lock_Vim();
- writer((writefn)(error ? emsg : msg), (char_u *)str, len);
+ writer((writefn)(error ? emsg : msg_wrapper), (char_u *)str, len);
Python_Release_Vim();
Py_END_ALLOW_THREADS
PyMem_Free(str);
@@ -634,7 +640,7 @@ VimTryEnd(void)
else if (msg_list != NULL && *msg_list != NULL)
{
int should_free;
- char_u *msg;
+ char *msg;
msg = get_exception_string(*msg_list, ET_ERROR, NULL, &should_free);
@@ -644,7 +650,7 @@ VimTryEnd(void)
return -1;
}
- PyErr_SetVim((char *) msg);
+ PyErr_SetVim(msg);
free_global_msglist();
@@ -3483,13 +3489,13 @@ OptionsIter(OptionsObject *self)
static int
set_option_value_err(char_u *key, int numval, char_u *stringval, int opt_flags)
{
- char_u *errmsg;
+ char *errmsg;
if ((errmsg = set_option_value(key, numval, stringval, opt_flags)))
{
if (VimTryEnd())
return FAIL;
- PyErr_SetVim((char *)errmsg);
+ PyErr_SetVim(errmsg);
return FAIL;
}
return OK;