aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-27 04:14:06 -04:00
Code Activity

patch 9.0.0838: compiler warnings for unused variables

Browse Source 
Problem:    Compiler warnings for unused variables.
Solution:   Addjust #ifdef and remove unused variables. (John Marriott)
This commit is contained in:
Bram Moolenaar
2022-11-06 11:27:46 +00:00
parent cd9c8d400c
commit a25f718431
4 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/gui.c
View File

@@ -64,7 +64,9 @@ static int disable_flush = 0; // If > 0, gui_mch_flush() is disabled.
gui_start(char_u *arg UNUSED) gui_start(char_u *arg UNUSED)
{ {
char_u *old_term; char_u *old_term;
#ifdef GUI_MAY_FORK
static int recursive = 0; static int recursive = 0;
#endif
#if defined(GUI_MAY_SPAWN) && defined(EXPERIMENTAL_GUI_CMD) #if defined(GUI_MAY_SPAWN) && defined(EXPERIMENTAL_GUI_CMD)
char *msg = NULL; char *msg = NULL;
#endif #endif
@@ -76,9 +78,8 @@ gui_start(char_u *arg UNUSED)
cursor_on(); // needed for ":gui" in .vimrc cursor_on(); // needed for ":gui" in .vimrc
full_screen = FALSE; full_screen = FALSE;
++recursive;
#ifdef GUI_MAY_FORK #ifdef GUI_MAY_FORK
++recursive;
/* /*
* Quit the current process and continue in the child. * Quit the current process and continue in the child.
* Makes "gvim file" disconnect from the shell it was started in. * Makes "gvim file" disconnect from the shell it was started in.
@@ -153,7 +154,9 @@ gui_start(char_u *arg UNUSED)
gui_mch_update(); gui_mch_update();
apply_autocmds(gui.in_use ? EVENT_GUIENTER : EVENT_GUIFAILED, apply_autocmds(gui.in_use ? EVENT_GUIENTER : EVENT_GUIFAILED,
NULL, NULL, FALSE, curbuf); NULL, NULL, FALSE, curbuf);
#ifdef GUI_MAY_FORK
--recursive; --recursive;
#endif
} }
/* /*

3
src/gui_w32.c
View File

@@ -6190,13 +6190,11 @@ gui_mch_draw_string(
// handled here. // handled here.
int i; int i;
int wlen; // string length in words int wlen; // string length in words
int clen; // string length in characters
int cells; // cell width of string up to composing char int cells; // cell width of string up to composing char
int cw; // width of current cell int cw; // width of current cell
int c; int c;
wlen = 0; wlen = 0;
clen = 0;
cells = 0; cells = 0;
for (i = 0; i < len; ) for (i = 0; i < len; )
{ {
@@ -6236,7 +6234,6 @@ gui_mch_draw_string(
} }
cells += cw; cells += cw;
i += utf_ptr2len_len(text + i, len - i); i += utf_ptr2len_len(text + i, len - i);
++clen;
} }
#if defined(FEAT_DIRECTX) #if defined(FEAT_DIRECTX)
if (IS_ENABLE_DIRECTX()) if (IS_ENABLE_DIRECTX())

3
src/os_win32.c
View File

@@ -4394,7 +4394,6 @@ dump_pipe(int options,
int ret; int ret;
DWORD len; DWORD len;
DWORD toRead; DWORD toRead;
int repeatCount;
// we query the pipe to see if there is any data to read // we query the pipe to see if there is any data to read
// to avoid to perform a blocking read // to avoid to perform a blocking read
@@ -4405,11 +4404,9 @@ dump_pipe(int options,
&availableBytes, // available bytes total &availableBytes, // available bytes total
NULL); // byteLeft NULL); // byteLeft
repeatCount = 0;
// We got real data in the pipe, read it // We got real data in the pipe, read it
while (ret != 0 && availableBytes > 0) while (ret != 0 && availableBytes > 0)
{ {
repeatCount++;
toRead = (DWORD)(BUFLEN - *buffer_off); toRead = (DWORD)(BUFLEN - *buffer_off);
toRead = availableBytes < toRead ? availableBytes : toRead; toRead = availableBytes < toRead ? availableBytes : toRead;
ReadFile(g_hChildStd_OUT_Rd, buffer + *buffer_off, toRead , &len, NULL); ReadFile(g_hChildStd_OUT_Rd, buffer + *buffer_off, toRead , &len, NULL);

2
src/version.c
View File

@@ -695,6 +695,8 @@ 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 */
/**/
838,
/**/ /**/
837, 837,
/**/ /**/