aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-25 03:54:15 -04:00
Code Activity

patch 8.1.0744: compiler warnings for signed/unsigned strings

Browse Source 
Problem:    Compiler warnings for signed/unsigned strings.
Solution:   A few more type cast fixes.
This commit is contained in:
Bram Moolenaar
2019-01-13 23:51:14 +01:00
parent f9e3e09fdc
commit b1443b480f
5 changed files with 23 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/if_perl.xs
View File

@@ -1564,7 +1564,7 @@ Blob(SV* sv)
PREINIT: PREINIT:
STRLEN len; STRLEN len;
char *s; char *s;
int i; unsigned i;
char buf[3]; char buf[3];
SV* newsv; SV* newsv;

16
src/if_py_both.h
View File

@@ -409,6 +409,12 @@ writer(writefn fn, char_u *str, PyInt n)
} }
} }
static int
msg_wrapper(char *text)
{
return msg((char_u *)text);
}
static int static int
write_output(OutputObject *self, PyObject *string) write_output(OutputObject *self, PyObject *string)
{ {
@@ -421,7 +427,7 @@ write_output(OutputObject *self, PyObject *string)
Py_BEGIN_ALLOW_THREADS Py_BEGIN_ALLOW_THREADS
Python_Lock_Vim(); 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(); Python_Release_Vim();
Py_END_ALLOW_THREADS Py_END_ALLOW_THREADS
PyMem_Free(str); PyMem_Free(str);
@@ -634,7 +640,7 @@ VimTryEnd(void)
else if (msg_list != NULL && *msg_list != NULL) else if (msg_list != NULL && *msg_list != NULL)
{ {
int should_free; int should_free;
char_u *msg; char *msg;
msg = get_exception_string(*msg_list, ET_ERROR, NULL, &should_free); msg = get_exception_string(*msg_list, ET_ERROR, NULL, &should_free);
@@ -644,7 +650,7 @@ VimTryEnd(void)
return -1; return -1;
} }
PyErr_SetVim((char *) msg); PyErr_SetVim(msg);
free_global_msglist(); free_global_msglist();
@@ -3483,13 +3489,13 @@ OptionsIter(OptionsObject *self)
static int static int
set_option_value_err(char_u *key, int numval, char_u *stringval, int opt_flags) 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 ((errmsg = set_option_value(key, numval, stringval, opt_flags)))
{ {
if (VimTryEnd()) if (VimTryEnd())
return FAIL; return FAIL;
PyErr_SetVim((char *)errmsg); PyErr_SetVim(errmsg);
return FAIL; return FAIL;
} }
return OK; return OK;

6
src/integration.c
View File

@@ -303,7 +303,7 @@ messageFromEserve(XtPointer clientData UNUSED,
char buffer[2*MAXPATHLEN]; char buffer[2*MAXPATHLEN];
vim_snprintf(buffer, sizeof(buffer), vim_snprintf(buffer, sizeof(buffer),
NOCATGETS("currentFile %d %s"), NOCATGETS("currentFile %d %s"),
f ? strlen(f) : 0, f ? f : ""); f ? (int)strlen(f) : 0, f ? f : "");
workshop_send_message(buffer); workshop_send_message(buffer);
} else if (strcmp(cmd, NOCATGETS("getCursorRow")) == 0) { } else if (strcmp(cmd, NOCATGETS("getCursorRow")) == 0) {
int row = workshop_test_getcursorrow(); int row = workshop_test_getcursorrow();
@@ -322,14 +322,14 @@ messageFromEserve(XtPointer clientData UNUSED,
char buffer[2*MAXPATHLEN]; char buffer[2*MAXPATHLEN];
vim_snprintf(buffer, sizeof(buffer), vim_snprintf(buffer, sizeof(buffer),
NOCATGETS("cursorRowText %d %s"), NOCATGETS("cursorRowText %d %s"),
t ? strlen(t) : 0, t ? t : ""); t ? (int)strlen(t) : 0, t ? t : "");
workshop_send_message(buffer); workshop_send_message(buffer);
} else if (strcmp(cmd, NOCATGETS("getSelectedText")) == 0) { } else if (strcmp(cmd, NOCATGETS("getSelectedText")) == 0) {
char *t = workshop_test_getselectedtext(); char *t = workshop_test_getselectedtext();
char buffer[2*MAXPATHLEN]; char buffer[2*MAXPATHLEN];
vim_snprintf(buffer, sizeof(buffer), vim_snprintf(buffer, sizeof(buffer),
NOCATGETS("selectedText %d %s"), NOCATGETS("selectedText %d %s"),
t ? strlen(t) : 0, t ? t : ""); t ? (int)strlen(t) : 0, t ? t : "");
workshop_send_message(buffer); workshop_send_message(buffer);
#endif #endif
} }

6
src/option.c
View File

@@ -6965,9 +6965,9 @@ did_set_string_option(
else if (varp == &p_guifontset) else if (varp == &p_guifontset)
{ {
if (STRCMP(p_guifontset, "*") == 0) if (STRCMP(p_guifontset, "*") == 0)
errmsg = (char_u *)N_("E597: can't select fontset"); errmsg = N_("E597: can't select fontset");
else if (gui.in_use && gui_init_font(p_guifontset, TRUE) != OK) else if (gui.in_use && gui_init_font(p_guifontset, TRUE) != OK)
errmsg = (char_u *)N_("E598: Invalid fontset"); errmsg = N_("E598: Invalid fontset");
redraw_gui_only = TRUE; redraw_gui_only = TRUE;
} }
# endif # endif
@@ -7687,7 +7687,7 @@ did_set_string_option(
p = (char_u *)MOUSE_ALL; p = (char_u *)MOUSE_ALL;
#else #else
if (*p_mouse != NUL) if (*p_mouse != NUL)
errmsg = (char_u *)N_("E538: No mouse support"); errmsg = N_("E538: No mouse support");
#endif #endif
} }
#if defined(FEAT_GUI) #if defined(FEAT_GUI)

2
src/version.c
View File

@@ -796,7 +796,7 @@ 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 */
/**/ /**/
743, 744,
/**/ /**/
743, 743,
/**/ /**/